From: Dmitry Stogov <dmitry@zend.com>
Date: Mon, 6 Jul 2015 13:30:50 +0000 (+0300)
Subject: Fixed JMPZNZ instruction printing
X-Git-Tag: php-7.0.0beta1~12^2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1a9f4f90da8fc6e91a1ac38addfa68556de89d4e;p=php

Fixed JMPZNZ instruction printing
---

diff --git a/sapi/phpdbg/phpdbg_opcode.c b/sapi/phpdbg/phpdbg_opcode.c
index 8adbbba36f..fdfc0e9278 100644
--- a/sapi/phpdbg/phpdbg_opcode.c
+++ b/sapi/phpdbg/phpdbg_opcode.c
@@ -87,7 +87,7 @@ char *phpdbg_decode_opline(zend_op_array *ops, zend_op *op, HashTable *vars) /*{
 	switch (op->opcode) {
 	/* TODO: ZEND_FAST_CALL, ZEND_FAST_RET op2 */
 	case ZEND_JMPZNZ:
-		asprintf(&decode[2], "J%u or J%" PRIu32, op->op2.opline_num, op->extended_value);
+		asprintf(&decode[2], "J%u or J%" PRIu32, OP_JMP_ADDR(op, op->op2) - ops->opcodes, ZEND_OFFSET_TO_OPLINE(op, op->extended_value) - ops->opcodes);
 		break;
 
 	case ZEND_JMPZ: