Changeset 772 in svn for branches/1.3/utils.c


Ignore:
Timestamp:
2011-04-18T09:25:37Z (4 years ago)
Author:
Xuefer
Message:

merge [769] from trunk

Location:
branches/1.3
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/1.3

    • Property svn:mergeinfo changed
      /trunkmerged: 769
  • branches/1.3/utils.c

    r766 r772  
    150150#endif
    151151            case ZEND_JMP:
     152                assert(Z_OP(opline->op1).jmp_addr - op_array->opcodes < op_array->last);
    152153                Z_OP(opline->op1).opline_num = Z_OP(opline->op1).jmp_addr - op_array->opcodes;
    153                 assert(Z_OP(opline->op1).opline_num < op_array->last);
    154154                break;
    155155            case ZEND_JMPZ:
     
    160160            case ZEND_JMP_SET:
    161161#endif
     162                assert(Z_OP(opline->op2).jmp_addr - op_array->opcodes < op_array->last);
    162163                Z_OP(opline->op2).opline_num = Z_OP(opline->op2).jmp_addr - op_array->opcodes;
    163                 assert(Z_OP(opline->op2).opline_num < op_array->last);
    164164                break;
    165165        }
     
    234234
    235235#ifdef HAVE_XCACHE_OPCODE_SPEC_DEF
    236 static void xc_fix_opcode_ex_znode(int tofix, xc_op_spec_t spec, zend_uchar *op_type, znode_op *op, int type TSRMLS_DC) /* {{{ */
     236static void xc_fix_opcode_ex_znode(int tofix, xc_op_spec_t spec, Z_OP_TYPEOF_TYPE *op_type, znode_op *op, int type TSRMLS_DC) /* {{{ */
    237237{
    238238#ifdef ZEND_ENGINE_2
Note: See TracChangeset for help on using the changeset viewer.