Fix zend_eval_string (and as such assert + dom tests)

diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c
index 0c6861c14da1412c44667f05e8b73b9e237757e0..7a5bd050d41a5a16ce3e7c0a1eaae1725b89d4eb 100644 (file)
--- a/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@ -1181,6 +1181,10 @@ 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 b17dbbf59fe28270deedea7282314ce016a6da33..ef4e5416f5dee110fe8f1800a70c8e96b6721665 100644 (file)
--- a/Zend/zend_vm_def.h
+++ b/Zend/zend_vm_def.h
@@ -1751,9 +1751,7 @@ ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
        zend_bool nested = EX(nested);
        zend_op_array *op_array = EX(op_array);
 
-       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)) {
+       if (EX(symbol_table) != NULL) {
                zend_detach_symbol_table(TSRMLS_C);
        }
        

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index 4f4df9d3f20f5d039b7df3b7e94957c2d992320c..addc89c72a3f728aff4cd85da5f8197d54c2d114 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -386,9 +386,7 @@ 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(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)) {
+       if (EX(symbol_table) != NULL) {
                zend_detach_symbol_table(TSRMLS_C);
        }