Changeset 11c56a5 in git


Ignore:
Timestamp:
2007-07-11T12:02:42Z (12 years ago)
Author:
Xuefer <xuefer@…>
Branches:
1.2, 1.3
Children:
d737e64
Parents:
daa3f82
Message:

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

git-svn-id: svn://svn.lighttpd.net/xcache/branches/1.2@446 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

File:
1 edited

Legend:

Unmodified
Added
Removed
  • xcache.c

    rbe67db0 r11c56a5  
    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
Note: See TracChangeset for help on using the changeset viewer.