Skip to content

Commit 168a5bb

Browse files
committed
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: fix uninitialized memory usage
2 parents e20fc85 + add0833 commit 168a5bb

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ext/standard/array.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,7 +1041,7 @@ PHP_FUNCTION(max)
10411041
static int php_array_walk(HashTable *target_hash, zval *userdata, int recursive TSRMLS_DC) /* {{{ */
10421042
{
10431043
zval **args[3], /* Arguments to userland function */
1044-
*retval_ptr, /* Return value - unused */
1044+
*retval_ptr = NULL, /* Return value - unused */
10451045
*key=NULL; /* Entry key */
10461046

10471047
/* Set up known arguments */
@@ -2911,7 +2911,7 @@ static int zval_compare(zval **a, zval **b TSRMLS_DC) /* {{{ */
29112911
static int zval_user_compare(zval **a, zval **b TSRMLS_DC) /* {{{ */
29122912
{
29132913
zval **args[2];
2914-
zval *retval_ptr;
2914+
zval *retval_ptr = NULL;
29152915

29162916
args[0] = (zval **) a;
29172917
args[1] = (zval **) b;

0 commit comments

Comments
 (0)