tony2001 Sun Nov 28 12:04:18 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard array.c
Log:
MFH: fix #29954 (array_reduce segfaults when initial value is array)
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.6&r2=1.266.2.7&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.6
php-src/ext/standard/array.c:1.266.2.7
--- php-src/ext/standard/array.c:1.266.2.6 Fri Nov 19 11:57:06 2004
+++ php-src/ext/standard/array.c Sun Nov 28 12:04:18 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.266.2.6 2004/11/19 16:57:06 tony2001 Exp $ */
+/* $Id: array.c,v 1.266.2.7 2004/11/28 17:04:18 tony2001 Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -3836,6 +3836,7 @@
efree(callback_name);
if (ZEND_NUM_ARGS() > 2) {
+ convert_to_long_ex(initial);
result = *initial;
} else {
MAKE_STD_ZVAL(result);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
