com php-src: Fix memleak in generators using symtable: Zend/tests/generators/generator_symtable_leak.phpt Zend /zend_generators.c
| From: | Bob Weinand | Date: | Thu, 14 May 2015 15:17:39 +0000 |
| Subject: | com php-src: Fix memleak in generators using symtable: Zend/tests/generators/generator_symtable_leak.phpt Zend /zend_generators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86761@lists.php.net to get a copy of this message | ||
Commit: c6a6b9746de0411fb2b352d8d4dfc432cb56eb91
Author: Bob Weinand <bobwei9@hotmail.com> Thu, 14 May 2015 17:17:39 +0200
Parents: fc75d07652717a374e01aa557b165af3fc9606b6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c6a6b9746de0411fb2b352d8d4dfc432cb56eb91
Log:
Fix memleak in generators using symtable
Changed paths:
A Zend/tests/generators/generator_symtable_leak.phpt
M Zend/zend_generators.c
Diff:
diff --git a/Zend/tests/generators/generator_symtable_leak.phpt
b/Zend/tests/generators/generator_symtable_leak.phpt
new file mode 100644
index 0000000..7c73622
--- /dev/null
+++ b/Zend/tests/generators/generator_symtable_leak.phpt
@@ -0,0 +1,20 @@
+--TEST--
+Generators using symtables must not leak
+--FILE--
+<?php
+
+function gen() {
+ $bar = ["some complex var"];
+ ${"f"."oo"} = "force symtable usage";
+ var_dump($bar);
+ yield;
+}
+
+gen()->valid();
+
+?>
+--EXPECT--
+array(1) {
+ [0]=>
+ string(16) "some complex var"
+}
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index e845b2e..706d913 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -104,11 +104,11 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool
finished
if (generator->execute_data) {
zend_execute_data *execute_data = generator->execute_data;
- if (!execute_data->symbol_table) {
- zend_free_compiled_variables(execute_data);
- } else {
+ if (execute_data->symbol_table) {
zend_clean_and_cache_symbol_table(execute_data->symbol_table);
}
+ /* always free the CV's, in the symtable are only not-free'd IS_INDIRECT's */
+ zend_free_compiled_variables(execute_data);
if (Z_OBJ(execute_data->This)) {
OBJ_RELEASE(Z_OBJ(execute_data->This));