summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReeze Xia <reeze@php.net>2015-02-28 13:14:39 +0800
committerReeze Xia <reeze@php.net>2015-02-28 13:14:39 +0800
commit85316b4bf02f75e6a89efb8b10416a0505a2ae4d (patch)
treee9f179e7bb889c26bbaf988bde0b12b701709abf
parented102533116d7771bf2f8fd5d0e4f345b38b1da5 (diff)
downloadphp-git-85316b4bf02f75e6a89efb8b10416a0505a2ae4d.tar.gz
Fixed memleak in alloc_globals_ctor
This free operation is missed when new MM was introduced in master.
-rw-r--r--Zend/zend_alloc.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index ad31d63454..70995688e8 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -1950,6 +1950,9 @@ void zend_mm_shutdown(zend_mm_heap *heap, int full, int silent)
#if ZEND_MM_CUSTOM
if (heap->use_custom_heap) {
+ if (full) {
+ free(heap);
+ }
return;
}
#endif