com php-src: Fix bug #63596: finally in generators segfaults: Zend/tests/generators/finally_ran_on_close.phpt Zend/ zend_generators.c
| From: | Nikita Popov | Date: | Sat, 24 Nov 2012 18:24:09 +0000 |
| Subject: | com php-src: Fix bug #63596: finally in generators segfaults: Zend/tests/generators/finally_ran_on_close.phpt Zend/ zend_generators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70584@lists.php.net to get a copy of this message | ||
Commit: 60871e51ada0644f258c991d67adba22d38f8a7b
Author: Nikita Popov <nikic@php.net> Sat, 24 Nov 2012 18:21:11 +0100
Parents: 966faa9a87b9d93150125633a705279284804a17
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=60871e51ada0644f258c991d67adba22d38f8a7b
Log:
Fix bug #63596: finally in generators segfaults
EX(fast_ret) wasn't initialized in this case so the code ended up
dereferencing an invalid pointer after the jump.
Bugs:
https://bugs.php.net/63596
Changed paths:
M Zend/tests/generators/finally_ran_on_close.phpt
M Zend/zend_generators.c
Diff:
diff --git a/Zend/tests/generators/finally_ran_on_close.phpt
b/Zend/tests/generators/finally_ran_on_close.phpt
index 44a84fa..04a0561 100644
--- a/Zend/tests/generators/finally_ran_on_close.phpt
+++ b/Zend/tests/generators/finally_ran_on_close.phpt
@@ -5,14 +5,18 @@ finally is run even if a generator is closed mid-execution
function gen() {
try {
- echo "before yield\n";
- yield;
- echo "after yield\n";
+ try {
+ echo "before yield\n";
+ yield;
+ echo "after yield\n";
+ } finally {
+ echo "finally run\n";
+ }
+ echo "code after finally\n";
} finally {
- echo "finally run\n";
+ echo "second finally run\n";
}
-
- echo "code after finally\n";
+ echo "code after second finally\n";
}
$gen = gen();
@@ -23,3 +27,4 @@ unset($gen);
--EXPECT--
before yield
finally run
+second finally run
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
index 516ff0b..1895305 100644
--- a/Zend/zend_generators.c
+++ b/Zend/zend_generators.c
@@ -60,6 +60,7 @@ void zend_generator_close(zend_generator *generator, zend_bool finished_executio
* the resume. */
if (finally_op_num) {
execute_data->opline = &op_array->opcodes[finally_op_num];
+ execute_data->fast_ret = NULL;
generator->flags |= ZEND_GENERATOR_FORCED_CLOSE;
zend_generator_resume(generator TSRMLS_CC);
return;