Changeset 437 for branches/1.2/xcache.c

Timestamp:

2007-06-30T07:33:30+02:00 (6 years ago)

Author:

moo

Message:

copy internal table correctly, refix #59 which is broken by [429]

Location:

branches/1.2

Files:

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

branches/1.2/xcache.c

@@ -1464 +1464 @@
     int i;
 
-    if (XG(internal_function_table).nTableSize == 0) {
+    if (!XG(internal_table_copied)) {
         zend_function tmp_func;
         xc_cest_t tmp_cest;
@@ -1476 +1476 @@
         zend_hash_copy(&XG(internal_function_table), CG(function_table), (copy_ctor_func_t) function_add_ref, &tmp_func, sizeof(tmp_func));
         zend_hash_copy(&XG(internal_class_table), CG(class_table), (copy_ctor_func_t) xc_zend_class_add_ref, &tmp_cest, sizeof(tmp_cest));
+
+        XG(internal_table_copied) = 1;
     }
     if (xc_php_hcache.size && !XG(php_holds)) {
@@ -1525 +1527 @@
     zend_hash_init_ex(&xcache_globals->internal_function_table, 1, NULL, NULL, 1, 0);
     zend_hash_init_ex(&xcache_globals->internal_class_table,    1, NULL, NULL, 1, 0);
-
 }
 /* }}} */
@@ -1554 +1555 @@
     }
 
-    zend_hash_destroy(&xcache_globals->internal_function_table);
-    zend_hash_destroy(&xcache_globals->internal_class_table);
+    if (XG(internal_table_copied)) {
+        zend_hash_destroy(&xcache_globals->internal_function_table);
+        zend_hash_destroy(&xcache_globals->internal_class_table);
+    }
 }
 /* }}} */