Changeset 446 for branches/1.2/xcache.c

Timestamp:

2007-07-11T14:02:42+02:00 (6 years ago)

Author:

moo

Message:

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

Location:

branches/1.2

Files:

• . (modified) (1 prop)
• xcache.c (modified) (3 diffs)

branches/1.2/xcache.c

@@ -547 +547 @@
     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) */
@@ -612 +613 @@
     free_alloca(new_cest_ptrs);
 #endif
+    CG(active_op_array) = old_active_op_array;
     return p->op_array;
 }
@@ -1145 +1147 @@
     }
     else {
+        zend_op_array *old_active_op_array = CG(active_op_array);
         CG(active_op_array) = op_array;
         xc_sandbox_free(&sandbox, XC_Install TSRMLS_CC);
+        CG(active_op_array) = old_active_op_array;
     }