Changeset 495

Timestamp:

01/04/2008 12:20:05 PM (5 years ago)

Author:

moo

Message:

shallow copy for some compiler result infos

Location:

trunk

Files:

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

trunk/processor/processor.m4

@@ -764 +764 @@
 #ifdef HAVE_XCACHE_CONSTANT
     DISPATCH(zend_uint, constinfo_cnt)
-    STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
+    IFRESTORE(`
+        COPY(constinfos)
+    ', `
+        STRUCT_ARRAY(constinfo_cnt, xc_constinfo_t, constinfos)
+    ')
 #endif
 
@@ -777 +781 @@
     ')
     STRUCT_ARRAY(classinfo_cnt, xc_classinfo_t, classinfos)
+    popdef(`BEFORE_LOOP')
 #ifdef ZEND_ENGINE_2_1
     DISPATCH(zend_uint, autoglobal_cnt)
-    STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
+    IFRESTORE(`
+        COPY(autoglobals)
+    ', `
+        STRUCT_ARRAY(autoglobal_cnt, xc_autoglobal_t, autoglobals)
+    ')
 #endif
     DISPATCH(zend_bool, have_early_binding)
-    popdef(`BEFORE_LOOP')
     DISPATCH(zend_bool, have_references)
 ')

trunk/xcache.c

@@ -1166 +1166 @@
     } zend_end_try();
 
-    xc_free_php(&php TSRMLS_CC);
+    if (php.funcinfos) {
+        efree(php.funcinfos);
+    }
+    if (php.classinfos) {
+        efree(php.classinfos);
+    }
 
     if (catched) {