Changeset 446 for branches/1.2

Show
Ignore:
Timestamp:
07/11/2007 12:02:42 PM (17 months ago)
Author:
moo
Message:

merged [444] from trunk: fixed #55 crashes php tokenizer on certain special situation

Location:
branches/1.2
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/1.2

    • Property svnmerge-integrated changed from /trunk:1-302,344-346,371,374-375,388,391,393,395,398,400,402-405,407,410,416,421,434-435,438 to /trunk:1-302,344-346,371,374-375,388,391,393,395,398,400,402-405,407,410,416,421,434-435,438,444

  • branches/1.2/xcache.c

    r439 r446  
    547547    zend_uint i; 
    548548    xc_entry_data_php_t *p = xce->data.php; 
     549    zend_op_array *old_active_op_array = CG(active_op_array); 
    549550#ifndef ZEND_ENGINE_2 
    550551    /* new ptr which is stored inside CG(class_table) */ 
    … …  
    612613    free_alloca(new_cest_ptrs); 
    613614#endif 
     615    CG(active_op_array) = old_active_op_array; 
    614616    return p->op_array; 
    615617} 
    … …  
    11451147    } 
    11461148    else { 
     1149        zend_op_array *old_active_op_array = CG(active_op_array); 
    11471150        CG(active_op_array) = op_array; 
    11481151        xc_sandbox_free(&sandbox, XC_Install TSRMLS_CC); 
     1152        CG(active_op_array) = old_active_op_array; 
    11491153    } 
    11501154