cvs: php-src(PHP_5_0) /ext/standard array.c

dmitry Wed Jun 8 15:54:46 2005 EDT Modified files: (Branch: PHP_5_0) /php-src/ext/standard array.c Log: Fixed memory allocation bugs in array_reduce() with initial value (#22463 & #24980) http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.17&r2=1.266.2.18&ty=u Index: php-src/ext/standard/array.c diff -u php-src/ext/standard/array.c:1.266.2.17 php-src/ext/standard/array.c:1.266.2.18 --- php-src/ext/standard/array.c:1.266.2.17 Mon Apr 25 02:11:00 2005 +++ php-src/ext/standard/array.c Wed Jun 8 15:54:46 2005 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: array.c,v 1.266.2.17 2005/04/25 06:11:00 dmitry Exp $ */ +/* $Id: array.c,v 1.266.2.18 2005/06/08 19:54:46 dmitry Exp $ */ #include "php.h" #include "php_ini.h" @@ -3863,8 +3863,11 @@ efree(callback_name); if (ZEND_NUM_ARGS() > 2) { - convert_to_long_ex(initial); - result = *initial; + ALLOC_ZVAL(result); + *result = **initial; + zval_copy_ctor(result); + convert_to_long(result); + INIT_PZVAL(result); } else { MAKE_STD_ZVAL(result); ZVAL_NULL(result); @@ -3880,6 +3883,7 @@ if (result) { *return_value = *result; zval_copy_ctor(return_value); + zval_ptr_dtor(&result); } return; }