dmitry                                   Mon, 26 Apr 2010 13:51:46 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=298599

Log:
Fixed crash in Zend/tests/unset_cv09.phpt

Changed paths:
    U   php/php-src/trunk/Zend/zend_execute_API.c

Modified: php/php-src/trunk/Zend/zend_execute_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_execute_API.c   2010-04-26 13:46:40 UTC (rev 
298598)
+++ php/php-src/trunk/Zend/zend_execute_API.c   2010-04-26 13:51:46 UTC (rev 
298599)
@@ -1696,7 +1696,7 @@
 {
        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 @@
                                }
                        }
                }
-               return SUCCESS;
+               return zend_hash_quick_del(&EG(symbol_table), name, name_len + 
1, hash_value);
        }
        return FAILURE;
 }

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to