Changeset 705 in svn for trunk

Timestamp:

2011-03-19T14:33:02Z (8 years ago)

Author:

Xuefer

Message:

fix builtin constant memory leak on compile

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• utils.c (modified) (3 diffs)

trunk/ChangeLog

@@ -15 +15 @@
  * compatibility fix: fix segv on shutdown when ionCube Loader is loaded
  * fixed undefined index for xcache.count=1 and xcache.var_size>1
+ * fix builtin constant memory leak on compile
 
 1.3.1 2010-11-27

trunk/utils.c

@@ -649 +649 @@
 }
 /* }}} */
-void xc_free_zend_constant(zend_constant *c) /* {{{ */
+static void xc_free_zend_constant(zend_constant *c) /* {{{ */
 {
     if (!(c->flags & CONST_PERSISTENT)) {
@@ -702 +702 @@
     zend_hash_init_ex(&TG(zend_constants),  20, NULL, (dtor_func_t) xc_free_zend_constant, h->persistent, h->bApplyProtection);
     xc_copy_internal_zend_constants(&TG(zend_constants), &XG(internal_constant_table));
-    {
-        zend_constant tmp_const;
-        zend_hash_copy(&TG(zend_constants), &XG(internal_constant_table), (copy_ctor_func_t) xc_zend_constant_ctor, (void *) &tmp_const, sizeof(tmp_const));
-    }
     TG(internal_constant_tail) = TG(zend_constants).pListTail;
 #endif
@@ -775 +771 @@
 
 #ifdef HAVE_XCACHE_CONSTANT
+    for (b = TG(zend_constants).pListHead; b != NULL && b != TG(internal_constant_tail); b = b->pListNext) {
+        zend_constant *c = (zend_constant*) b->pData;
+        xc_free_zend_constant(c);
+    }
+
     b = TG(internal_constant_tail) ? TG(internal_constant_tail)->pListNext : TG(zend_constants).pListHead;
     /* install constants */