From: Dmitry Stogov <dmitry@php.net>
Date: Mon, 26 Apr 2010 13:51:46 +0000 (+0000)
Subject: Fixed crash in Zend/tests/unset_cv09.phpt
X-Git-Tag: php-5.4.0alpha1~191^2~1652
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c179430ec39a35e98588bfbca53970958cfba7e;p=php

Fixed crash in Zend/tests/unset_cv09.phpt
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 18b7368509..a0dcb48e64 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1696,7 +1696,7 @@ ZEND_API int zend_delete_global_variable_ex(char *name, int name_len, ulong hash
 {
 	zend_execute_data *ex;
 
-	if (zend_hash_quick_del(&EG(symbol_table), name, name_len + 1, hash_value) == SUCCESS) {
+	if (zend_hash_quick_exists(&EG(symbol_table), name, name_len + 1, hash_value)) {
 		for (ex = EG(current_execute_data); ex; ex = ex->prev_execute_data) {
 			if (ex->op_array && ex->symbol_table == &EG(symbol_table)) {
 				int i;
@@ -1711,7 +1711,7 @@ ZEND_API int zend_delete_global_variable_ex(char *name, int name_len, ulong hash
 				}
 			}
 		}
-		return SUCCESS;
+		return zend_hash_quick_del(&EG(symbol_table), name, name_len + 1, hash_value);
 	}
 	return FAILURE;
 }