Changeset 620 for branches/1.3/xcache.c

Timestamp:

2009-07-05T10:05:41+02:00 (4 years ago)

Author:

moo

Message:

merged r499,r501,r502 from trunk

Location:

branches/1.3

Files:

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

branches/1.3/xcache.c

@@ -1286 +1286 @@
     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((char *) ZSTR_V(op_array->arg_info[i].name));
+            if (ZSTR_V(op_array->arg_info[i].class_name)) {
+                efree((char *) ZSTR_V(op_array->arg_info[i].class_name));
             }
         }
@@ -1434 +1434 @@
         xc_php_caches = NULL;
     }
-    xc_php_hcache.size = 0;
 
     if (xc_var_caches) {
@@ -1440 +1439 @@
         xc_var_caches = NULL;
     }
-    xc_var_hcache.size = 0;
 
     if (shm) {
@@ -1518 +1516 @@
     }
 
-    if (xc_var_hcache.size && !XG(var_holds)) {
+    if (xc_initized && xc_var_hcache.size && !XG(var_holds)) {
         XG(var_holds) = calloc(xc_var_hcache.size, sizeof(xc_stack_t));
         for (i = 0; i < xc_var_hcache.size; i ++) {