Changeset 344 for trunk/utils.c

Timestamp:

02/04/2007 06:22:14 AM (22 months ago)

Author:

moo

Message:

copy internal functions/classes into sandbox, they're needed by compiler

Files:

• trunk/utils.c (modified) (5 diffs)

trunk/utils.c

@@ -1 +1 @@
 
 #include "xcache.h"
+#include "stack.h"
+#include "xcache_globals.h"
 #include "utils.h"
 #ifdef ZEND_ENGINE_2_1
@@ -531 +533 @@
 {
     HashTable *h;
+    zend_function tmp_func;
+    xc_cest_t tmp_cest;
+
     if (sandbox) {
         memset(sandbox, 0, sizeof(sandbox[0]));
@@ -567 +572 @@
     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));
+    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));
+    TG(internal_class_tail) = TG(class_table).pListTail;
+
 #ifdef ZEND_ENGINE_2_1
     /* shallow copy, don't destruct */
@@ -613 +624 @@
 #endif
 
-    b = TG(function_table).pListHead;
+    b = TG(internal_function_tail) ? TG(internal_function_tail)->pListNext : TG(function_table).pListHead;
     /* install function */
     while (b != NULL) {
@@ -622 +633 @@
     }
 
-    b = TG(class_table).pListHead;
+    b = TG(internal_class_tail) ? TG(internal_class_tail)->pListNext : TG(class_table).pListHead;
     /* install class */
     while (b != NULL) {