summaryrefslogtreecommitdiff
path: root/Zend/zend_opcode.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2015-10-30 14:53:53 +0300
committerDmitry Stogov <dmitry@zend.com>2015-10-30 14:53:53 +0300
commit3e89c883bbfc1c67ff356b547046f2d7f7325058 (patch)
treea070492a537903fe13566fd728a0d45166e9d37e /Zend/zend_opcode.c
parent880965b95e25a9dfe976aa6bf905c408796c7a64 (diff)
downloadphp-git-3e89c883bbfc1c67ff356b547046f2d7f7325058.tar.gz
Changed ZEND_CLONE->extended_value meaning to relative offset (previously it was absolute opline number)
Diffstat (limited to 'Zend/zend_opcode.c')
-rw-r--r--Zend/zend_opcode.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
index 8abfd7a56c..4cf131af53 100644
--- a/Zend/zend_opcode.c
+++ b/Zend/zend_opcode.c
@@ -646,6 +646,10 @@ ZEND_API int pass_two(zend_op_array *op_array)
case ZEND_DECLARE_ANON_CLASS:
ZEND_PASS_TWO_UPDATE_JMP_TARGET(op_array, opline, opline->op1);
break;
+ case ZEND_CATCH:
+ /* absolute index to relative offset */
+ opline->extended_value = ZEND_OPLINE_NUM_TO_OFFSET(op_array, opline, opline->extended_value);
+ break;
case ZEND_JMPZNZ:
/* absolute index to relative offset */
opline->extended_value = ZEND_OPLINE_NUM_TO_OFFSET(op_array, opline, opline->extended_value);