Changeset 1481 in svn


Ignore:
Timestamp:
2014-02-26T05:04:47+01:00 (15 months ago)
Author:
Xuefer
Message:

more asserts for class index

Location:
trunk/processor
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/head.m4

    r1473 r1481  
    255255            processor->cache_ce = ceptr;
    256256            processor->cache_class_index = i;
     257            assert(i <= processor->active_class_index);
    257258            return i + 1;
    258259        }
     
    266267static zend_class_entry *xc_get_class(xc_processor_t *processor, zend_ulong class_num) { /* {{{ */
    267268    /* must be parent or currrent class */
     269    assert(class_num > 0);
    268270    assert(class_num <= processor->active_class_index + 1);
    269271    return CestToCePtr(processor->php_dst->classinfos[class_num - 1].cest);
  • trunk/processor/processor.m4

    r1478 r1481  
    11831183
    11841184    PROCESS(zend_uint, classinfo_cnt)
    1185     STRUCT_ARRAY(zend_uint, classinfo_cnt, xc_classinfo_t, classinfos, , IFRESTORE(`processor->active_class_index'))
     1185    STRUCT_ARRAY(zend_uint, classinfo_cnt, xc_classinfo_t, classinfos, , IFCOPY(`processor->active_class_index'))
    11861186#ifdef ZEND_ENGINE_2_1
    11871187    PROCESS(zend_uint, autoglobal_cnt)
Note: See TracChangeset for help on using the changeset viewer.