From: Rob Richards <rrichards@php.net>
Date: Thu, 10 Feb 2005 23:00:53 +0000 (+0000)
Subject: MFH: fix segfault in array_walk when retval_ptr is empty
X-Git-Tag: php-5.0.4RC1~179
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0542a6f2c2a5f5264f56a85bae1bf4bf202a20e1;p=php

MFH: fix segfault in array_walk when retval_ptr is empty
 - such as when exception thrown
---

diff --git a/ext/standard/array.c b/ext/standard/array.c
index ff3af2aa26..511e3cceaa 100644
--- a/ext/standard/array.c
+++ b/ext/standard/array.c
@@ -1052,7 +1052,9 @@ static int php_array_walk(HashTable *target_hash, zval **userdata, int recursive
 
 			/* 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;