diff options
| author | Nikita Popov <nikic@php.net> | 2015-06-11 17:44:51 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-06-11 17:44:51 +0200 |
| commit | 580eb56fb78456144918c3053676c46cd2cee529 (patch) | |
| tree | f42534e57be7790b89ddee3cb1453af3875fec3e /Zend/zend_generators.c | |
| parent | 8cfe28259ed0b0bebb72d8292abc877181b84d34 (diff) | |
| parent | 8405265578d2df8d76be223910b3e44aff4bdfef (diff) | |
| download | php-git-580eb56fb78456144918c3053676c46cd2cee529.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_generators.c
Diffstat (limited to 'Zend/zend_generators.c')
| -rw-r--r-- | Zend/zend_generators.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c index 706d913f72..13304e9fdd 100644 --- a/Zend/zend_generators.c +++ b/Zend/zend_generators.c @@ -176,8 +176,10 @@ static void zend_generator_dtor_storage(zend_object *object) /* {{{ */ if (finally_op_num) { zval *fast_call = ZEND_CALL_VAR(ex, ex->func->op_array.opcodes[finally_op_end].op1.var); - Z_OBJ_P(fast_call) = NULL; + Z_OBJ_P(fast_call) = EG(exception); + EG(exception) = NULL; fast_call->u2.lineno = (uint32_t)-1; + ex->opline = &ex->func->op_array.opcodes[finally_op_num]; generator->flags |= ZEND_GENERATOR_FORCED_CLOSE; zend_generator_resume(generator); |