author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Wed, 30 Mar 2016 10:07:29 -0700 | |
changeset 5679 | d91b8121bb2a |
parent 5518 | c47fe0edc204 |
child 7485 | 89b2d849f322 |
permissions | -rw-r--r-- |
5518
c47fe0edc204
20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1082
diff
changeset
|
1 |
# Setting the freed pointer to NULL after free'ing |
c47fe0edc204
20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1082
diff
changeset
|
2 |
# prevents it from being double-free'd. |
c47fe0edc204
20612604 upgrade bash to 4.3
Stefan Teleman <stefan.teleman@oracle.com>
parents:
1082
diff
changeset
|
3 |
# Solaris-specific patch. |
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
4 |
--- 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
|
5 |
+++ 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
|
6 |
@@ -36,7 +36,7 @@ |
110
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
7 |
#if HANDLE_MULTIBYTE |
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
8 |
|
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
9 |
#ifndef FREE |
77641682ba6f
7015638 bash needs to move to userland
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff
changeset
|
10 |
-# 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
|
11 |
+# 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
|
12 |
#endif |
1082
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
13 |
|
6d49548fa9da
15754923 SUNBT7111705 Upgrade bash to 4.2
Stefan Teleman <stefan.teleman@oracle.com>
parents:
115
diff
changeset
|
14 |
#if ! HAVE_STRCHRNUL |