rrichards Thu Feb 10 18:00:55 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/standard array.c
Log:
MFH: fix segfault in array_walk when retval_ptr is empty
- such as when exception thrown
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.266.2.12&r2=1.266.2.13&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.266.2.12
php-src/ext/standard/array.c:1.266.2.13
--- php-src/ext/standard/array.c:1.266.2.12 Wed Feb 2 05:24:50 2005
+++ php-src/ext/standard/array.c Thu Feb 10 18:00:53 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.266.2.12 2005/02/02 10:24:50 stas Exp $ */
+/* $Id: array.c,v 1.266.2.13 2005/02/10 23:00:53 rrichards Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1052,7 +1052,9 @@
/* Call the userland function */
if (zend_call_function(&fci, &BG(array_walk_fci_cache)
TSRMLS_CC) == SUCCESS) {
- zval_ptr_dtor(&retval_ptr);
+ if (retval_ptr) {
+ zval_ptr_dtor(&retval_ptr);
+ }
} else {
char *func_name;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
