clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix memory leak in compile_string when there's a parse error (used e.g. in eval or assert)

Browse Source
This commit is contained in:
Nuno Lopes 2012-01-01 22:45:58 +00:00
parent e4ca0ed09f
commit bac57c94fb
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Zend/zend_language_scanner.l
View File

@ -536,6 +536,8 @@ zend_op_array *compile_string(zval *source_string, char *filename TSRMLS_DC)
if (compiler_result==1) {
CG(active_op_array) = original_active_op_array;
CG(unclean_shutdown)=1;
destroy_op_array(op_array TSRMLS_CC);
efree(op_array);
retval = NULL;
} else {
zend_do_return(NULL, 0 TSRMLS_CC);

8
tests/lang/019.phpt
View File

@ -3,8 +3,6 @@ eval() test
--FILE--
<?php
error_reporting(0);
eval("function test() { echo \"hey, this is a function inside an eval()!\\n\"; }");
$i=0;
@ -13,7 +11,9 @@ while ($i<10) {
test();
$i++;
}
--EXPECT--
eval('-');
--EXPECTF--
hey, this is a regular echo'd eval()
hey, this is a function inside an eval()!
hey, this is a regular echo'd eval()
@ -34,3 +34,5 @@ hey, this is a regular echo'd eval()
hey, this is a function inside an eval()!
hey, this is a regular echo'd eval()
hey, this is a function inside an eval()!
Parse error: syntax error, unexpected end of file in %s019.php(12) : eval()'d code on line 1