Changeset 345

Timestamp:

02/04/2007 08:15:00 AM (21 months ago)

Author:

moo

Message:

copy function/class table correctly by using add_ref

Location:

trunk

Files:

• utils.c (modified) (2 diffs)
• utils.h (modified) (1 diff)
• xcache.c (modified) (1 diff)

trunk/utils.c

@@ -530 +530 @@
 /* }}} */
 #endif
+
+void xc_zend_class_add_ref(zend_class_entry ZESW(*ce, **ce))
+{
+#ifdef ZEND_ENGINE_2
+    (*ce)->refcount++;
+#else
+    (*ce->refcount)++;
+#endif
+}
+
 xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC) /* {{{ */
 {
@@ -572 +582 @@
     h = OG(function_table);
     zend_hash_init_ex(&TG(function_table), 128, NULL, h->pDestructor, h->persistent, h->bApplyProtection);
-    zend_hash_copy(&TG(function_table), &XG(internal_function_table), NULL, (void *) &tmp_func, sizeof(tmp_func));
+    zend_hash_copy(&TG(function_table), &XG(internal_function_table), (copy_ctor_func_t) function_add_ref, (void *) &tmp_func, sizeof(tmp_func));
     TG(internal_class_tail) = TG(function_table).pListTail;
 
     h = OG(class_table);
     zend_hash_init_ex(&TG(class_table),     16, NULL, h->pDestructor, h->persistent, h->bApplyProtection);
-    zend_hash_copy(&TG(class_table), &XG(internal_class_table), NULL, (void *) &tmp_cest, sizeof(tmp_cest));
+    zend_hash_copy(&TG(class_table), &XG(internal_class_table), (copy_ctor_func_t) xc_zend_class_add_ref, (void *) &tmp_cest, sizeof(tmp_cest));
     TG(internal_class_tail) = TG(class_table).pListTail;
 

trunk/utils.h

@@ -75 +75 @@
 } xc_sandbox_t;
 
+void xc_zend_class_add_ref(zend_class_entry ZESW(*ce, **ce));
 xc_sandbox_t *xc_sandbox_init(xc_sandbox_t *sandbox, char *filename TSRMLS_DC);
 void xc_sandbox_free(xc_sandbox_t *sandbox, int install TSRMLS_DC);

trunk/xcache.c

@@ -1610 +1610 @@
 
         zend_hash_init_ex(&XG(internal_function_table), 100, NULL, NULL, 1, 0);
-        zend_hash_copy(&XG(internal_function_table), CG(function_table), NULL, &tmp_func, sizeof(tmp_func));
+        zend_hash_copy(&XG(internal_function_table), CG(function_table), (copy_ctor_func_t) function_add_ref, &tmp_func, sizeof(tmp_func));
 
         zend_hash_init_ex(&XG(internal_class_table), 10, NULL, NULL, 1, 0);
-        zend_hash_copy(&XG(internal_class_table), CG(class_table), NULL, &tmp_cest, sizeof(tmp_cest));
+        zend_hash_copy(&XG(internal_class_table), CG(class_table), (copy_ctor_func_t) xc_zend_class_add_ref, &tmp_cest, sizeof(tmp_cest));
     }
     if (xc_php_hcache.size && !XG(php_holds)) {