Changeset 817 for branches/1.3/utils.c


Ignore:
Timestamp:
2011-06-04T05:34:36+02:00 (3 years ago)
Author:
moo
Message:

merge from trunk: disassembler/decompiler improvements

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

  • branches/1.3/utils.c

    r784 r817  
    150150#endif 
    151151            case ZEND_JMP: 
    152                 assert(Z_OP(opline->op1).jmp_addr - op_array->opcodes < op_array->last); 
     152                assert(Z_OP(opline->op1).jmp_addr >= op_array->opcodes && Z_OP(opline->op1).jmp_addr - op_array->opcodes < op_array->last); 
    153153                Z_OP(opline->op1).opline_num = Z_OP(opline->op1).jmp_addr - op_array->opcodes; 
    154154                break; 
     
    160160            case ZEND_JMP_SET: 
    161161#endif 
    162                 assert(Z_OP(opline->op2).jmp_addr - op_array->opcodes < op_array->last); 
     162                assert(Z_OP(opline->op2).jmp_addr >= op_array->opcodes && Z_OP(opline->op2).jmp_addr - op_array->opcodes < op_array->last); 
    163163                Z_OP(opline->op2).opline_num = Z_OP(opline->op2).jmp_addr - op_array->opcodes; 
    164164                break; 
Note: See TracChangeset for help on using the changeset viewer.