rrichards Thu Feb 10 17:59:27 2005 EDT
Modified files:
/php-src/ext/standard array.c
Log:
fix segfault when retval_ptr is empty - such as when exception thrown
http://cvs.php.net/diff.php/php-src/ext/standard/array.c?r1=1.289&r2=1.290&ty=u
Index: php-src/ext/standard/array.c
diff -u php-src/ext/standard/array.c:1.289 php-src/ext/standard/array.c:1.290
--- php-src/ext/standard/array.c:1.289 Wed Feb 2 05:37:50 2005
+++ php-src/ext/standard/array.c Thu Feb 10 17:59:26 2005
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: array.c,v 1.289 2005/02/02 10:37:50 stas Exp $ */
+/* $Id: array.c,v 1.290 2005/02/10 22:59:26 rrichards Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -1084,7 +1084,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
