Changeset 1381 for trunk


Ignore:
Timestamp:
2013-09-22T17:04:51+02:00 (14 months ago)
Author:
moo
Message:

possible fix for #324

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/processor/processor.m4

    r1380 r1381  
    735735        /* really fast shallow copy */ 
    736736        memcpy(dst, src, sizeof(src[0])); 
    737         DST(`refcount[0]') = 1000; 
     737        DST(`refcount') = &XG(op_array_dummy_refcount_holder); 
     738        DST(`refcount[0]') = -1; 
    738739#ifdef ZEND_ACC_ALIAS 
    739740        if ((processor->active_class_entry_src && (processor->active_class_entry_src->ce_flags & ZEND_ACC_TRAIT))) { 
     
    878879 
    879880    STRUCT_P(zend_uint, refcount) 
    880     UNFIXPOINTER(zend_uint, refcount) 
    881     IFSTORE(`DST(`refcount[0]') = 1;') 
     881    IFSTORE(` 
     882        UNFIXPOINTER(zend_uint, refcount) 
     883        DST(`refcount[0]') = 1; 
     884        FIXPOINTER(zend_uint, refcount) 
     885    ') 
    882886 
    883887#ifdef ZEND_ENGINE_2_4 
  • trunk/xcache_globals.h

    r1234 r1381  
    4444 
    4545    void *sandbox; 
     46    zend_uint op_array_dummy_refcount_holder; 
    4647ZEND_END_MODULE_GLOBALS(xcache) 
    4748 
Note: See TracChangeset for help on using the changeset viewer.