diff options
author | Dmitry Stogov <dmitry@zend.com> | 2015-03-04 17:55:02 +0300 |
---|---|---|
committer | Dmitry Stogov <dmitry@zend.com> | 2015-03-04 17:55:02 +0300 |
commit | 68d45751321201b62a0f07a951354a303968d1ed (patch) | |
tree | 71ac78a6fc525669bf297a74431cb542016df00b | |
parent | 8ec8648c911d848c86316b8dce2b9d8ce23098ff (diff) | |
parent | 85316b4bf02f75e6a89efb8b10416a0505a2ae4d (diff) | |
download | php-git-68d45751321201b62a0f07a951354a303968d1ed.tar.gz |
Merge branch 'pull-request/1128'
* pull-request/1128:
Fixed memleak in alloc_globals_ctor
-rw-r--r-- | Zend/zend_alloc.c | 3 |
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 |