diff options
| author | Nikita Popov <nikic@php.net> | 2012-11-24 18:21:11 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2012-11-24 19:24:09 +0100 |
| commit | 60871e51ada0644f258c991d67adba22d38f8a7b (patch) | |
| tree | 5da97f18ca1324a14b05537421e629d5a53621c7 /Zend/tests/generators | |
| parent | 966faa9a87b9d93150125633a705279284804a17 (diff) | |
| download | php-git-60871e51ada0644f258c991d67adba22d38f8a7b.tar.gz | |
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.
Diffstat (limited to 'Zend/tests/generators')
| -rw-r--r-- | Zend/tests/generators/finally_ran_on_close.phpt | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Zend/tests/generators/finally_ran_on_close.phpt b/Zend/tests/generators/finally_ran_on_close.phpt index 44a84fae5c..04a0561c87 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 |