Changeset 444 for trunk

Timestamp:

2007-07-11T13:58:16+02:00 (6 years ago)

Author:

moo

Message:

fixed #55: crashes php tokenizer on certain special situation

File:

• trunk/xcache.c (modified) (3 diffs)

trunk/xcache.c

@@ -607 +607 @@
     zend_uint i;
     xc_entry_data_php_t *p = xce->data.php;
+    zend_op_array *old_active_op_array = CG(active_op_array);
 #ifndef ZEND_ENGINE_2
     /* new ptr which is stored inside CG(class_table) */
@@ -672 +673 @@
     free_alloca(new_cest_ptrs);
 #endif
+    CG(active_op_array) = old_active_op_array;
     return p->op_array;
 }
@@ -1381 +1383 @@
     else {
         if (newlycompiled) {
+            zend_op_array *old_active_op_array = CG(active_op_array);
             /* install it */
             CG(active_op_array) = op_array;
             xc_sandbox_free(&sandbox, XC_Install TSRMLS_CC);
+            CG(active_op_array) = old_active_op_array;
         }
     }