diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-31 10:51:00 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-31 10:51:31 +0200 |
| commit | ad750c3bb6e7b48384c6265eb9d3bcf5b4000652 (patch) | |
| tree | a4b941ba7f558f7efd1d3e97f22ffccc705f73c1 /Zend/zend_generators.c | |
| parent | 376bbbdf3b6b0ec08102c3ccb31746c2a7d9bdd6 (diff) | |
| download | php-git-ad750c3bb6e7b48384c6265eb9d3bcf5b4000652.tar.gz | |
Fix handling of exception if valid() during yield from
Fixes oss-fuzz #25296.
Diffstat (limited to 'Zend/zend_generators.c')
| -rw-r--r-- | Zend/zend_generators.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index 4ccb57907f..bb3260b11b 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -709,6 +709,9 @@ static int zend_generator_get_next_delegated_value(zend_generator *generator) /* } if (iter->funcs->valid(iter) == FAILURE) { + if (UNEXPECTED(EG(exception) != NULL)) { + goto exception; + } /* reached end of iteration */ goto failure; } |