[PHP-CVS] cvs: php-src(PHP_4_3) /ext/standard array.c

[Antony Dovgal]

tony2001                Sun Nov 28 12:12:59 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /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.199.2.38&r2=1.199.2.39&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.199.2.38 
php-src/ext/standard/array.c:1.199.2.39
--- php-src/ext/standard/array.c:1.199.2.38     Fri Nov 19 11:58:38 2004
+++ php-src/ext/standard/array.c        Sun Nov 28 12:12:59 2004
@@ -22,7 +22,7 @@
 */
 
 
-/* $Id: array.c,v 1.199.2.38 2004/11/19 16:58:38 tony2001 Exp $ */
+/* $Id: array.c,v 1.199.2.39 2004/11/28 17:12:59 tony2001 Exp $ */
 
 #include "php.h"
 #include "php_ini.h"
@@ -3228,6 +3228,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