Changeset 444 in svn for trunk/xcache.c


Ignore:
Timestamp:
2007-07-11T13:58:16+02:00 (8 years ago)
Author:
Xuefer
Message:

fixed #55: crashes php tokenizer on certain special situation

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/xcache.c

    r438 r444  
    607607    zend_uint i;
    608608    xc_entry_data_php_t *p = xce->data.php;
     609    zend_op_array *old_active_op_array = CG(active_op_array);
    609610#ifndef ZEND_ENGINE_2
    610611    /* new ptr which is stored inside CG(class_table) */
     
    672673    free_alloca(new_cest_ptrs);
    673674#endif
     675    CG(active_op_array) = old_active_op_array;
    674676    return p->op_array;
    675677}
     
    13811383    else {
    13821384        if (newlycompiled) {
     1385            zend_op_array *old_active_op_array = CG(active_op_array);
    13831386            /* install it */
    13841387            CG(active_op_array) = op_array;
    13851388            xc_sandbox_free(&sandbox, XC_Install TSRMLS_CC);
     1389            CG(active_op_array) = old_active_op_array;
    13861390        }
    13871391    }
Note: See TracChangeset for help on using the changeset viewer.