Changeset 817 for branches/1.3/utils.c

Timestamp:

2011-06-04T05:34:36+02:00 (2 years ago)

Author:

moo

Message:

merge from trunk: disassembler/decompiler improvements

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• utils.c (modified) (2 diffs)

branches/1.3/utils.c

@@ -150 +150 @@
 #endif
             case ZEND_JMP:
-                assert(Z_OP(opline->op1).jmp_addr - op_array->opcodes < op_array->last);
+                assert(Z_OP(opline->op1).jmp_addr >= op_array->opcodes && Z_OP(opline->op1).jmp_addr - op_array->opcodes < op_array->last);
                 Z_OP(opline->op1).opline_num = Z_OP(opline->op1).jmp_addr - op_array->opcodes;
                 break;
@@ -160 +160 @@
             case ZEND_JMP_SET:
 #endif
-                assert(Z_OP(opline->op2).jmp_addr - op_array->opcodes < op_array->last);
+                assert(Z_OP(opline->op2).jmp_addr >= op_array->opcodes && Z_OP(opline->op2).jmp_addr - op_array->opcodes < op_array->last);
                 Z_OP(opline->op2).opline_num = Z_OP(opline->op2).jmp_addr - op_array->opcodes;
                 break;