[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_execute_API.c
dmitry Mon, 26 Apr 2010 13:51:46 + 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
[PHP-CVS] svn: /php/php-src/trunk/Zend/ zend_execute_API.c
tony2001 Fri, 23 Apr 2010 09:11:44 + Revision: http://svn.php.net/viewvc?view=revision&revision=298370 Log: fix WS 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-23 08:56:03 UTC (rev 298369) +++ php/php-src/trunk/Zend/zend_execute_API.c 2010-04-23 09:11:44 UTC (rev 298370) @@ -1585,7 +1585,7 @@ if ((fetch_type & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_INTERFACE) { zend_error(E_ERROR, "Interface '%s' not found", class_name); } else if ((fetch_type & ZEND_FETCH_CLASS_MASK) == ZEND_FETCH_CLASS_TRAIT) { - zend_error(E_ERROR, "Trait '%s' not found", class_name); + zend_error(E_ERROR, "Trait '%s' not found", class_name); } else { zend_error(E_ERROR, "Class '%s' not found", class_name); } -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php