author | John Beck <John.Beck@Oracle.COM> |
Tue, 06 Oct 2015 07:41:40 -0700 | |
changeset 4973 | be26c0c14fa7 |
parent 1082 | 6d49548fa9da |
child 5518 | c47fe0edc204 |
permissions | -rw-r--r-- |
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
1 |
--- lib/glob/xmbsrtowcs.c 2010-05-30 15:36:27.000000000 -0700 |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
2 |
+++ lib/glob/xmbsrtowcs.c 2011-11-29 09:34:23.471481937 -0800 |
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
3 |
@@ -36,7 +36,7 @@ |
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
4 |
#if HANDLE_MULTIBYTE |
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
5 |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
6 |
#ifndef FREE |
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
-# define FREE(x) do { if (x) free (x); } while (0) |
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
8 |
+# define FREE(x) do { if (x) free (x); x = 0; } while (0) |
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
#endif |
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
10 |
|
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
11 |
#if ! HAVE_STRCHRNUL |