From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 26 Mar 2014 20:04:50 +0000 (+0400)
Subject: Fixed symbol table detaching
X-Git-Tag: POST_PHPNG_MERGE~412^2~220
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f53c31265f411d9d8af5b745095aaf4507d046fe;p=php

Fixed symbol table detaching
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 0980517935..b3dfbf8e06 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));
+		}
 	}
 }
 /* }}} */