From: Anatol Belski <ab@php.net>
Date: Sun, 14 Jul 2013 18:46:19 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.1~28
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=168a5bb6dfe7de976e2372d3c5d8773f3bf03727;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix uninitialized memory usage
---

168a5bb6dfe7de976e2372d3c5d8773f3bf03727
diff --cc ext/standard/array.c
index 9bfb0887ac,9b02575276..e281690ecd
--- 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;