Changeset 498 for trunk

Timestamp:

01/04/2008 02:05:12 PM (9 months ago)

Author:

moo

Message:

PHP_5_3: deep copy arg_info which is modified by executor

Location:

trunk

Files:

• processor/processor.m4 (modified) (2 diffs)
• xcache.c (modified) (3 diffs)
• xcache.h (modified) (1 diff)
• xcache_globals.h (modified) (1 diff)

trunk/processor/processor.m4

@@ -504 +504 @@
     dnl readonly_protection=on
     dnl main op_array && have early binding
+    zend_uint ii;
     if (!processor->readonly_protection && !(src == processor->php_src->op_array && processor->php_src->have_early_binding)) {
         /* really fast shallow copy */
@@ -510 +511 @@
         /* deep */
         STRUCT_P(HashTable, static_variables, HashTable_zval_ptr)
+        STRUCT_ARRAY_I(num_args, zend_arg_info, arg_info)
+        xc_gc_add_op_array(dst TSRMLS_CC);
         define(`SKIPASSERT_ONCE')
     }

trunk/xcache.c

@@ -1477 +1477 @@
 /* }}} */
 
+/* {{{ xc_gc_op_array_t */
+typedef struct {
+    zend_uint num_args;
+    zend_arg_info *arg_info;
+} xc_gc_op_array_t;
+/* }}} */
+void xc_gc_add_op_array(zend_op_array *op_array TSRMLS_DC) /* {{{ */
+{
+    xc_gc_op_array_t gc_op_array;
+    gc_op_array.num_args = op_array->num_args;
+    gc_op_array.arg_info = op_array->arg_info;
+    zend_hash_next_index_insert(&XG(gc_op_arrays), (void *) &gc_op_array, sizeof(gc_op_array), NULL);
+}
+/* }}} */
+static void xc_gc_op_array(void *pDest) /* {{{ */
+{
+    xc_gc_op_array_t *op_array = (xc_gc_op_array_t *) pDest;
+    zend_uint i;
+    if (op_array->arg_info) {
+        for (i = 0; i < op_array->num_args; i++) {
+            efree((char*)op_array->arg_info[i].name);
+            if (op_array->arg_info[i].class_name) {
+                efree((char*)op_array->arg_info[i].class_name);
+            }
+        }
+        efree(op_array->arg_info);
+    }
+}
+/* }}} */
+
 /* module helper function */
 static int xc_init_constant(int module_number TSRMLS_DC) /* {{{ */
@@ -1711 +1741 @@
     }
 
+    zend_hash_init(&XG(gc_op_arrays), 32, NULL, xc_gc_op_array, 0);
+
 #if PHP_API_VERSION <= 20041225
     XG(request_time) = time(NULL);
@@ -1725 +1757 @@
 {
     xc_entry_unholds(TSRMLS_C);
+    zend_hash_destroy(&XG(gc_op_arrays));
     xc_gc_expires_php(TSRMLS_C);
     xc_gc_expires_var(TSRMLS_C);

trunk/xcache.h

@@ -361 +361 @@
 int xc_is_ro(const void *p);
 int xc_is_shm(const void *p);
+void xc_gc_add_op_array(zend_op_array *op_array TSRMLS_DC);
 
 #endif /* __XCACHE_H */

trunk/xcache_globals.h

@@ -18 +18 @@
     long   var_ttl;
 
+    HashTable gc_op_arrays;
+
     HashTable internal_function_table;
     HashTable internal_class_table;