com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/array.c
| From: | Anatol Belski | Date: | Sun, 14 Jul 2013 18:46:19 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/standard/array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72637@lists.php.net to get a copy of this message | ||
Commit: 168a5bb6dfe7de976e2372d3c5d8773f3bf03727
Author: Anatol Belski <ab@php.net> Sun, 14 Jul 2013 20:46:19 +0200
Parents: e20fc854540716117aea5e169cf2a5cbb4af0a56 add0833681bba61f1953262f81286cb4a56f0431
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=168a5bb6dfe7de976e2372d3c5d8773f3bf03727
Log:
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix uninitialized memory usage
Changed paths:
MM ext/standard/array.c
Diff:
diff --cc ext/standard/array.c
index 9bfb088,9b02575..e281690
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@@ -1041,8 -1053,11 +1041,8 @@@ PHP_FUNCTION(max
static int php_array_walk(HashTable *target_hash, zval *userdata, int recursive TSRMLS_DC) /* {{{
*/
{
zval **args[3], /* Arguments to userland function */
- *retval_ptr, /* Return value - unused */
+ *retval_ptr = NULL, /* Return value - unused */
*key=NULL; /* Entry key */
- char *string_key;
- uint string_key_len;
- ulong num_key;
/* Set up known arguments */
args[1] = &key;