diff options
Diffstat (limited to 'Zend/zend_execute.c')
| -rw-r--r-- | Zend/zend_execute.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 2d1bd5e3d0..065809f1a6 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2395,6 +2395,15 @@ static zend_always_inline void i_cleanup_unfinished_execution(zend_execute_data zend_op *opline = EX(func)->op_array.opcodes + op_num; int level; int do_exit; + + if (UNEXPECTED(opline->opcode == ZEND_INIT_FCALL || + opline->opcode == ZEND_INIT_FCALL_BY_NAME || + opline->opcode == ZEND_INIT_DYNAMIC_CALL || + opline->opcode == ZEND_INIT_METHOD_CALL || + opline->opcode == ZEND_INIT_STATIC_METHOD_CALL)) { + ZEND_ASSERT(op_num); + opline--; + } do { /* If the exception was thrown during a function call there might be |