com php-src: Fixed symbol table detaching: Zend/zend_execute _API.c

From: Date: Wed, 26 Mar 2014 20:04:50 +0000
Subject: com php-src: Fixed symbol table detaching: Zend/zend_execute _API.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-77543@lists.php.net to get a copy of this message
Commit: f53c31265f411d9d8af5b745095aaf4507d046fe Author: Dmitry Stogov <dmitry@zend.com> Thu, 27 Mar 2014 00:04:50 +0400 Parents: f3272bf7acdd10ad0cea048c056d75ef39ce3f51 Branches: phpng Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f53c31265f411d9d8af5b745095aaf4507d046fe Log: Fixed symbol table detaching Changed paths: M Zend/zend_execute_API.c Diff: diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 0980517..b3dfbf8 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -1753,8 +1753,12 @@ ZEND_API void zend_detach_symbol_table(TSRMLS_D) /* {{{ */ /* copy real values from CV slots into symbol table */ for (i = 0; i < op_array->last_var; i++) { - zend_hash_update(ht, op_array->vars[i], EX_VAR_NUM(i)); - ZVAL_UNDEF(EX_VAR_NUM(i)); + if (Z_TYPE_P(EX_VAR_NUM(i)) == IS_UNDEF) { + zend_hash_del(ht, op_array->vars[i]); + } else { + zend_hash_update(ht, op_array->vars[i], EX_VAR_NUM(i)); + ZVAL_UNDEF(EX_VAR_NUM(i)); + } } } /* }}} */

« previous php.cvs (#77543) next »