com php-src: Free loop variables: Zend/tests/generators/no_fo reach_var_leaks.phpt Zend/zend_generators.c Zend/ zend_generators.h Zend/zend_vm_def.h
Zend/zend_ vm_execute.h

From: Date: Sun, 27 May 2012 15:14:20 +0000
Subject: com php-src: Free loop variables: Zend/tests/generators/no_fo reach_var_leaks.phpt Zend/zend_generators.c Zend/ zend_generators.h Zend/zend_vm_def.h
Zend/zend_ vm_execute.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-70069@lists.php.net to get a copy of this message
Commit: 64a643a4e3c1b45d3a9b2ad24537f7aab6296f7d Author: Nikita Popov <nikic@php.net> Sun, 27 May 2012 17:14:20 +0200 Parents: 247bb737d552508829c5de7770ed0b15c3d8f7fd Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=64a643a4e3c1b45d3a9b2ad24537f7aab6296f7d Log: Free loop variables If the generator is closed before it has finished running, it may happen that some FREE or SWITCH_FREE opcodes haven't been executed and memory is leaked. This fixes it by walking the brk_cont_array and manually freeing the variables. Changed paths: A Zend/tests/generators/no_foreach_var_leaks.phpt M Zend/zend_generators.c M Zend/zend_generators.h M Zend/zend_vm_def.h M Zend/zend_vm_execute.h Diff: diff --git a/Zend/tests/generators/no_foreach_var_leaks.phpt b/Zend/tests/generators/no_foreach_var_leaks.phpt new file mode 100644 index 0000000..36ab91b --- /dev/null +++ b/Zend/tests/generators/no_foreach_var_leaks.phpt @@ -0,0 +1,19 @@ +--TEST-- +foreach() (and other) variables aren't leaked on premature close +--FILE-- +<?php + +function *gen(array $array) { + foreach ($array as $value) { + yield $value; + } +} + +$gen = gen(['Foo', 'Bar']); +var_dump($gen->current()); + +// generator is closed here, without running SWITCH_FREE + +?> +--EXPECT-- +string(3) "Foo" diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index ae706f1..12116a0 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -26,7 +26,7 @@ ZEND_API zend_class_entry *zend_ce_generator; static zend_object_handlers zend_generator_handlers; -void zend_generator_close(zend_generator *generator TSRMLS_DC) /* {{{ */ +void zend_generator_close(zend_generator *generator, zend_bool finished_execution TSRMLS_DC) /* {{{ */ { if (generator->execute_data) { zend_execute_data *execute_data = generator->execute_data; @@ -52,6 +52,42 @@ void zend_generator_close(zend_generator *generator TSRMLS_DC) /* {{{ */ zval_ptr_dtor(&execute_data->current_this); } + /* If the generator is closed before it can finish execution (reach + * a return statement) we have to free loop variables manually, as + * we don't know whether the SWITCH_FREE / FREE opcodes have run */ + if (!finished_execution) { + zend_op_array *op_array = execute_data->op_array; + zend_uint op_num = execute_data->opline - op_array->opcodes; + + int i; + for (i = 0; i < op_array->last_brk_cont; ++i) { + zend_brk_cont_element *brk_cont = op_array->brk_cont_array + i; + + if (brk_cont->start < 0) { + continue; + } else if (brk_cont->start > op_num) { + break; + } else if (brk_cont->brk > op_num) { + zend_op *brk_opline = op_array->opcodes + brk_cont->brk; + + switch (brk_opline->opcode) { + case ZEND_SWITCH_FREE: + { + temp_variable *var = (temp_variable *) ((char *) execute_data->Ts + brk_opline->op1.var); + zval_ptr_dtor(&var->var.ptr); + } + break; + case ZEND_FREE: + { + temp_variable *var = (temp_variable *) ((char *) execute_data->Ts + brk_opline->op1.var); + zval_dtor(&var->tmp_var); + } + break; + } + } + } + } + efree(execute_data); generator->execute_data = NULL; } @@ -66,7 +102,7 @@ void zend_generator_close(zend_generator *generator TSRMLS_DC) /* {{{ */ static void zend_generator_free_storage(zend_generator *generator TSRMLS_DC) /* {{{ */ { - zend_generator_close(generator TSRMLS_CC); + zend_generator_close(generator, 0 TSRMLS_CC); zend_object_std_dtor(&generator->std TSRMLS_CC); efree(generator); diff --git a/Zend/zend_generators.h b/Zend/zend_generators.h index 4becddf..192e9e7 100644 --- a/Zend/zend_generators.h +++ b/Zend/zend_generators.h @@ -35,7 +35,7 @@ typedef struct _zend_generator { extern ZEND_API zend_class_entry *zend_ce_generator; void zend_register_generator_ce(TSRMLS_D); -void zend_generator_close(zend_generator *generator TSRMLS_DC); +void zend_generator_close(zend_generator *generator, zend_bool finished_execution TSRMLS_DC); END_EXTERN_C() diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 42397ed..440b36d 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -2845,7 +2845,7 @@ ZEND_VM_HANDLER(62, ZEND_RETURN, CONST|TMP|VAR|CV, ANY) zend_generator *generator = (zend_generator *) zend_object_store_get_object(*EG(return_value_ptr_ptr) TSRMLS_CC); /* Close the generator to free up resources. */ - zend_generator_close(generator TSRMLS_CC); + zend_generator_close(generator, 1 TSRMLS_CC); /* Pass execution back to generator handling code */ ZEND_VM_RETURN(); diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index fa802c6..8f06afa 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -2331,7 +2331,7 @@ static int ZEND_FASTCALL ZEND_RETURN_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARG zend_generator *generator = (zend_generator *) zend_object_store_get_object(*EG(return_value_ptr_ptr) TSRMLS_CC); /* Close the generator to free up resources. */ - zend_generator_close(generator TSRMLS_CC); + zend_generator_close(generator, 1 TSRMLS_CC); /* Pass execution back to generator handling code */ ZEND_VM_RETURN(); @@ -6915,7 +6915,7 @@ static int ZEND_FASTCALL ZEND_RETURN_SPEC_TMP_HANDLER(ZEND_OPCODE_HANDLER_ARGS) zend_generator *generator = (zend_generator *) zend_object_store_get_object(*EG(return_value_ptr_ptr) TSRMLS_CC); /* Close the generator to free up resources. */ - zend_generator_close(generator TSRMLS_CC); + zend_generator_close(generator, 1 TSRMLS_CC); /* Pass execution back to generator handling code */ ZEND_VM_RETURN(); @@ -11404,7 +11404,7 @@ static int ZEND_FASTCALL ZEND_RETURN_SPEC_VAR_HANDLER(ZEND_OPCODE_HANDLER_ARGS) zend_generator *generator = (zend_generator *) zend_object_store_get_object(*EG(return_value_ptr_ptr) TSRMLS_CC); /* Close the generator to free up resources. */ - zend_generator_close(generator TSRMLS_CC); + zend_generator_close(generator, 1 TSRMLS_CC); /* Pass execution back to generator handling code */ ZEND_VM_RETURN(); @@ -27449,7 +27449,7 @@ static int ZEND_FASTCALL ZEND_RETURN_SPEC_CV_HANDLER(ZEND_OPCODE_HANDLER_ARGS) zend_generator *generator = (zend_generator *) zend_object_store_get_object(*EG(return_value_ptr_ptr) TSRMLS_CC); /* Close the generator to free up resources. */ - zend_generator_close(generator TSRMLS_CC); + zend_generator_close(generator, 1 TSRMLS_CC); /* Pass execution back to generator handling code */ ZEND_VM_RETURN();

« previous php.cvs (#70069) next »