diff options
| author | Anatol Belski <ab@php.net> | 2013-07-14 20:46:19 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2013-07-14 20:46:19 +0200 |
| commit | 168a5bb6dfe7de976e2372d3c5d8773f3bf03727 (patch) | |
| tree | 1b0c35f96b6193a23509532ebd2a5f6b323bc0d4 /ext/standard/array.c | |
| parent | e20fc854540716117aea5e169cf2a5cbb4af0a56 (diff) | |
| parent | add0833681bba61f1953262f81286cb4a56f0431 (diff) | |
| download | php-git-168a5bb6dfe7de976e2372d3c5d8773f3bf03727.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix uninitialized memory usage
Diffstat (limited to 'ext/standard/array.c')
| -rw-r--r-- | ext/standard/array.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/standard/array.c b/ext/standard/array.c index 9bfb0887ac..e281690ecd 100644 --- a/ext/standard/array.c +++ b/ext/standard/array.c @@ -1041,7 +1041,7 @@ 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 */ /* Set up known arguments */ @@ -2911,7 +2911,7 @@ static int zval_compare(zval **a, zval **b TSRMLS_DC) /* {{{ */ static int zval_user_compare(zval **a, zval **b TSRMLS_DC) /* {{{ */ { zval **args[2]; - zval *retval_ptr; + zval *retval_ptr = NULL; args[0] = (zval **) a; args[1] = (zval **) b; |