Changeset 8784ed0 in git

Timestamp:

2011-03-19T14:54:32Z (9 years ago)

Author:

Xuefer <xuefer@…>

Branches:

1.3

Children:

bd9466d

Parents:

6b78ab8

Message:

fixed #258: builtin constant memory leak on compile

git-svn-id: ​svn://svn.lighttpd.net/xcache/branches/1.3@708 c26eb9a1-5813-0410-bd6c-c2e55f420ca7

Files:

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

ChangeLog

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

utils.c

@@ -600 +600 @@
 }
 /* }}} */
+static void xc_free_zend_constant(zend_constant *c) /* {{{ */
+{
+    if (!(c->flags & CONST_PERSISTENT)) {
+        zval_dtor(&c->value);
+    }
+    free(ZSTR_V(c->name));
+}
+/* }}} */
 void xc_copy_internal_zend_constants(HashTable *target, HashTable *source) /* {{{ */
 {
@@ -643 +651 @@
 #ifdef HAVE_XCACHE_CONSTANT
     h = OG(zend_constants);
-    zend_hash_init_ex(&TG(zend_constants),  20, NULL, h->pDestructor, h->persistent, h->bApplyProtection);
+    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
@@ -712 +716 @@
 
 #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 */