Changeset 131 for trunk/xcache.c


Ignore:
Timestamp:
2006-09-03T09:37:05+02:00 (8 years ago)
Author:
moo
Message:

move open_files out of sandbox, it's not needed

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/xcache.c

    r130 r131  
    559559    i = 1; 
    560560    zend_hash_add(&EG(included_files), xce->name.str.val, xce->name.str.len+1, (void *)&i, sizeof(int), NULL); 
    561     zend_llist_add_element(&CG(open_files), h); 
     561    if (h) { 
     562        zend_llist_add_element(&CG(open_files), h); 
     563    } 
    562564 
    563565#ifndef ZEND_ENGINE_2 
     
    939941 
    940942    if (xc_test && stored_xce) { 
    941         /* no install, keep open_files too for h */ 
     943        /* free it, no install. restore now */ 
    942944        xc_sandbox_free(&sandbox, 0 TSRMLS_CC); 
    943         sandbox.tmp_open_files->dtor = NULL; 
    944945    } 
    945946    else { 
     
    956957        destroy_op_array(op_array TSRMLS_CC); 
    957958        efree(op_array); 
     959        h = NULL; 
    958960        goto restore; 
    959961    } 
Note: See TracChangeset for help on using the changeset viewer.