summaryrefslogtreecommitdiff
path: root/Zend/zend_alloc.c
diff options
context:
space:
mode:
authorBob Weinand <bobwei9@hotmail.com>2015-08-21 23:36:31 +0100
committerBob Weinand <bobwei9@hotmail.com>2015-08-21 23:36:31 +0100
commit76e3e99dd674fe98130ba110564c607b12a7772c (patch)
treea41bcd6977d13ff2c5f7638d302dce0203667ee5 /Zend/zend_alloc.c
parentf9ae74a4c05584983add5ab68042419d44032b1b (diff)
downloadphp-git-76e3e99dd674fe98130ba110564c607b12a7772c.tar.gz
Fix issues with phpdbg SIGINT handler
Also fix valgrind warnings in allocator when not using mmap()ed memory
Diffstat (limited to 'Zend/zend_alloc.c')
-rw-r--r--Zend/zend_alloc.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 493cf1f728..16838e04da 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -2765,6 +2765,7 @@ ZEND_API zend_mm_heap *zend_mm_startup_ex(const zend_mm_handlers *handlers, void
#endif
heap->storage = &tmp_storage;
heap->huge_list = NULL;
+ memset(heap->free_slot, 0, sizeof(heap->free_slot));
storage = _zend_mm_alloc(heap, sizeof(zend_mm_storage) + data_size ZEND_FILE_LINE_CC ZEND_FILE_LINE_CC);
if (!storage) {
handlers->chunk_free(&tmp_storage, chunk, ZEND_MM_CHUNK_SIZE);