diff options
| author | Bob Weinand <bobwei9@hotmail.com> | 2016-01-24 19:55:16 +0100 |
|---|---|---|
| committer | Bob Weinand <bobwei9@hotmail.com> | 2016-01-24 19:55:16 +0100 |
| commit | 001ce475ee158cbf020755f1f65aade28caafd73 (patch) | |
| tree | 19f246fd423a01b60da9aa6e546b2ec9024858d1 /Zend/zend_opcode.c | |
| parent | ae122bf7adf4f8b2df6b5acf316d16112587d921 (diff) | |
| download | php-git-001ce475ee158cbf020755f1f65aade28caafd73.tar.gz | |
Fixed bug #71441 (Typehinted Generator with return in try/finally crashes)
Diffstat (limited to 'Zend/zend_opcode.c')
| -rw-r--r-- | Zend/zend_opcode.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index dee54ba14c..2cf32b9c0a 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -668,9 +668,13 @@ ZEND_API int pass_two(zend_op_array *op_array) case ZEND_VERIFY_RETURN_TYPE: if (op_array->fn_flags & ZEND_ACC_GENERATOR) { if (opline->op1_type != IS_UNUSED) { - (opline + 1)->op1 = opline->op1; - (opline + 1)->op1_type = opline->op1_type; + zend_op *ret = opline; + do ret++; while (ret->opcode != ZEND_RETURN); + + ret->op1 = opline->op1; + ret->op1_type = opline->op1_type; } + MAKE_NOP(opline); } break; |