From: Nikita Popov <nikic@php.net>
Date: Fri, 18 Apr 2014 15:19:31 +0000 (+0200)
Subject: Revert "Fix zend_eval_string (and as such assert + dom tests)"
X-Git-Tag: POST_PHPNG_MERGE~412^2~82^2~2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f76c683d37c06dd3ea6f71c85731d245c8ad3814;p=php

Revert "Fix zend_eval_string (and as such assert + dom tests)"

This reverts commit 64cc5a72e2695962676c6fe4a96779d554d4ab24.
---

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 7a5bd050d4..0c6861c14d 100644
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1181,10 +1181,6 @@ ZEND_API int zend_eval_stringl(char *str, int str_len, zval *retval_ptr, char *s
 			}
 		}
 
-		if (EG(current_execute_data)) {
-			zend_attach_symbol_table(TSRMLS_C);
-		}
-
 		EG(no_extensions)=0;
 		EG(opline_ptr) = original_opline_ptr;
 		EG(active_op_array) = original_active_op_array;
diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h
index ef4e5416f5..b17dbbf59f 100644
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1751,7 +1751,9 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
 	zend_bool nested = EX(nested);
 	zend_op_array *op_array = EX(op_array);
 
-	if (EX(symbol_table) != NULL) {
+	if ((EX(prev_execute_data) && EX(prev_execute_data)->opline
+	     && EX(prev_execute_data)->opline->opcode == ZEND_INCLUDE_OR_EVAL)
+	    || EG(active_symbol_table) == &EG(symbol_table)) {
 		zend_detach_symbol_table(TSRMLS_C);
 	}
 	
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index addc89c72a..4f4df9d3f2 100644
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -386,7 +386,9 @@ static int ZEND_FASTCALL zend_leave_helper_SPEC(ZEND_OPCODE_HANDLER_ARGS)
 	zend_bool nested = EX(nested);
 	zend_op_array *op_array = EX(op_array);
 
-	if (EX(symbol_table) != NULL) {
+	if ((EX(prev_execute_data) && EX(prev_execute_data)->opline
+	     && EX(prev_execute_data)->opline->opcode == ZEND_INCLUDE_OR_EVAL)
+	    || EG(active_symbol_table) == &EG(symbol_table)) {
 		zend_detach_symbol_table(TSRMLS_C);
 	}