tony2001 Thu Dec 16 14:20:56 2004 EDT Modified files: (Branch: PHP_5_0) /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.266.2.9&r2=1.266.2.10&ty=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.266.2.9 php-src/ext/standard/array.c:1.266.2.10 --- php-src/ext/standard/array.c:1.266.2.9 Fri Dec 3 12:51:17 2004 +++ php-src/ext/standard/array.c Thu Dec 16 14:20:54 2004 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.266.2.9 2004/12/03 17:51:17 tony2001 Exp $ */ +/* $Id: array.c,v 1.266.2.10 2004/12/16 19:20:54 tony2001 Exp $ */ #include "php.h" #include "php_ini.h" @@ -1487,13 +1487,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); }
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php