cvs: php-src(PHP_4_3) /ext/standard array.c
| From: | Antony Dovgal | Date: | Thu, 16 Dec 2004 19:24:00 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /ext/standard array.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29563@lists.php.net to get a copy of this message | ||
tony2001 Thu Dec 16 14:24:00 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/standard array.c
Log:
MFH: fix leak (init array only if we got valid start key)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.199.2.40&r2=1.199.2.41&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.199.2.40 php-src/ext/standard/array.c:1.199.2.41
--- php-src/ext/standard/array.c:1.199.2.40 Thu Dec 2 11:36:41 2004
+++ php-src/ext/standard/array.c Thu Dec 16 14:23:59 2004
@@ -22,7 +22,7 @@
*/
-/* $Id: array.c,v 1.199.2.40 2004/12/02 16:36:41 tony2001 Exp $ */
+/* $Id: array.c,v 1.199.2.41 2004/12/16 19:23:59 tony2001 Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1391,13 +1391,13 @@
WRONG_PARAM_COUNT;
}
- /* allocate an array for return */
- array_init(return_value);
-
switch (Z_TYPE_PP(start_key)) {
case IS_STRING:
case IS_LONG:
case IS_DOUBLE:
+ /* allocate an array for return */
+ array_init(return_value);
+
if (PZVAL_IS_REF(*val)) {
SEPARATE_ZVAL(val);
}