eval() with parse error uses clean shutdown now

php · Aug 26, 2014 · b7876e7 · b7876e7
1 parent 6c687e0
commit b7876e7
Show file tree

Hide file tree

Showing 4 changed files with 393 additions and 422 deletions.
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -1238,7 +1238,6 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */
 			EG(current_execute_data)->opline->extended_value == ZEND_EVAL)) {
 			EG(exit_status) = 255;
 		}
-		zend_init_compiler_data_structures(TSRMLS_C);
 	}
 }
 /* }}} */

diff --git a/Zend/zend_language_parser.y b/Zend/zend_language_parser.y
@@ -55,9 +55,9 @@ static YYSIZE_T zend_yytnamerr(char*, const char*);
 #endif
 }
 
-%destructor {
-	zend_ast_destroy($$);
-} <ast, list>
+%destructor { zend_ast_destroy($$); } <ast>
+%destructor { zend_ast_destroy((zend_ast *) $$); } <list>
+%destructor { if ($$) STR_RELEASE($$); } <str>
 
 %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
 %left ','