diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-03-17 11:57:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-03-17 11:57:08 +0800 |
| commit | a3940c1867d10f177c46860ed4632d79960f5e82 (patch) | |
| tree | 46c5983cecafb5d84330a40ea26f4e028b0666f3 /Zend | |
| parent | b9aed47a7a9a1e9485317b5b0d5c58ff4cec5456 (diff) | |
| parent | fc49f1c41139962030810c7563aab6f325b218e0 (diff) | |
| download | php-git-a3940c1867d10f177c46860ed4632d79960f5e82.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
Fix build
Fix build
Fix build
prepare for 5.6.20RC1
Fix more emails
More email fixing
Fix emails in headers. @mysql.com addresses are no more since many years.
fix #ifdef usage
Diffstat (limited to 'Zend')
| -rw-r--r-- | Zend/zend_generators.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index 9633fc4f2d..5a3e84ccd1 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -386,6 +386,8 @@ ZEND_API zend_execute_data *zend_generator_check_placeholder_frame(zend_execute_ static void zend_generator_throw_exception(zend_generator *generator, zval *exception) { + zend_execute_data *original_execute_data = EG(current_execute_data); + /* if we don't stop an array/iterator yield from, the exception will only reach the generator after the values were all iterated over */ if (UNEXPECTED(Z_TYPE(generator->values) != IS_UNDEF)) { zval_ptr_dtor(&generator->values); @@ -394,7 +396,6 @@ static void zend_generator_throw_exception(zend_generator *generator, zval *exce /* Throw the exception in the context of the generator. Decrementing the opline * to pretend the exception happened during the YIELD opcode. */ - zend_execute_data *original_execute_data = EG(current_execute_data); EG(current_execute_data) = generator->execute_data; generator->execute_data->opline--; if (exception) { |