diff options
| author | Nikita Popov <nikic@php.net> | 2014-07-02 17:35:03 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2014-07-02 17:36:27 +0200 |
| commit | 1ea4b17af2e3fe23cd8cea0ffaf74a2a863580e1 (patch) | |
| tree | e0ae3d769582ed6204dbc3b8699686f6989b8b70 /Zend/zend_generators.c | |
| parent | 1163a7ce24850af498dd8f344cfbf44b7a063829 (diff) | |
| parent | d9ebd0f3d696e42d7c7bd2b0176414534aed0ef1 (diff) | |
| download | php-git-1ea4b17af2e3fe23cd8cea0ffaf74a2a863580e1.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'Zend/zend_generators.c')
| -rw-r--r-- | Zend/zend_generators.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index 7d7c330710..2b4a8c9a16 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -125,6 +125,7 @@ ZEND_API void zend_generator_close(zend_generator *generator, zend_bool finished /* A fatal error / die occurred during the generator execution. Trying to clean * up the stack may not be safe in this case. */ if (CG(unclean_shutdown)) { + generator->execute_data = NULL; return; } |