From 724051e3bd0b8618edd1dd3f29f27939efefff08 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Mon, 6 Jul 2015 20:53:54 +0200 Subject: [PATCH] Fix crash when exception occurs during nested rope Adds extra condition that the rope var of INIT/ADD must match the one one END. --- Zend/tests/exception_in_nested_rope.phpt | 17 +++++++++++++++++ Zend/zend_execute.c | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Zend/tests/exception_in_nested_rope.phpt diff --git a/Zend/tests/exception_in_nested_rope.phpt b/Zend/tests/exception_in_nested_rope.phpt new file mode 100644 index 0000000000..df0d6fbf8d --- /dev/null +++ b/Zend/tests/exception_in_nested_rope.phpt @@ -0,0 +1,17 @@ +--TEST-- +Exception during nested rope +--FILE-- + +--EXPECT-- +Exception diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 88d0135cfc..6122566b3e 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -2522,7 +2522,8 @@ static zend_always_inline void i_cleanup_unfinished_execution(zend_execute_data } else if (brk_opline->opcode == ZEND_ROPE_END) { zend_string **rope = (zend_string **) EX_VAR(brk_opline->op1.var); zend_op *last = EX(func)->op_array.opcodes + op_num; - while (last->opcode != ZEND_ROPE_ADD && last->opcode != ZEND_ROPE_INIT) { + while ((last->opcode != ZEND_ROPE_ADD && last->opcode != ZEND_ROPE_INIT) + || last->result.var != brk_opline->op1.var) { ZEND_ASSERT(last >= EX(func)->op_array.opcodes); last--; } -- 2.40.0