clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-21 18:07:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix throwing of yield from related exceptions into generator

Browse Source 
Use the general zend_generator_throw_exception() helper for this.
Otherwise we don't handle the off-by-one opline correctly (should
we maybe just stop doing that?)

This is a followup to ad750c3bb6,
which fixed a different yield from exception handling problem that
happened to show up in the same test case from oss-fuzz #25321.
Now both issues should be fixed.
This commit is contained in:
Nikita Popov 2020-09-02 10:50:14 +02:00
parent a07c1f56aa
commit 2e9e706a82
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zend/tests/generators/yield_from_valid_exception.phpt
View File

@ -15,7 +15,8 @@ class FooBar implements Iterator {
function gen() { function gen() {
try { try {
yield from new FooBar; // the fact that the yield from result is used is relevant.
var_dump(yield from new FooBar);
} catch (Exception $e) { } catch (Exception $e) {
echo $e->getMessage(), "\n"; echo $e->getMessage(), "\n";
} }

2
Zend/zend_generators.c
View File

@ -740,7 +740,7 @@ static int zend_generator_get_next_delegated_value(zend_generator *generator) /*
return SUCCESS; return SUCCESS;
exception: exception:
zend_rethrow_exception(generator->execute_data); zend_generator_throw_exception(generator, NULL);
failure: failure:
zval_ptr_dtor(&generator->values); zval_ptr_dtor(&generator->values);