Changeset 131 for trunk/xcache.c

Timestamp:

2006-09-03T09:37:05+02:00 (7 years ago)

Author:

moo

Message:

move open_files out of sandbox, it's not needed

File:

• trunk/xcache.c (modified) (3 diffs)

trunk/xcache.c

@@ -559 +559 @@
     i = 1;
     zend_hash_add(&EG(included_files), xce->name.str.val, xce->name.str.len+1, (void *)&i, sizeof(int), NULL);
-    zend_llist_add_element(&CG(open_files), h);
+    if (h) {
+        zend_llist_add_element(&CG(open_files), h);
+    }
 
 #ifndef ZEND_ENGINE_2
@@ -939 +941 @@
 
     if (xc_test && stored_xce) {
-        /* no install, keep open_files too for h */
+        /* free it, no install. restore now */
         xc_sandbox_free(&sandbox, 0 TSRMLS_CC);
-        sandbox.tmp_open_files->dtor = NULL;
     }
     else {
@@ -956 +957 @@
         destroy_op_array(op_array TSRMLS_CC);
         efree(op_array);
+        h = NULL;
         goto restore;
     }