From: Xinchen Hui <laruence@php.net>
Date: Mon, 9 Mar 2015 03:19:05 +0000 (+0800)
Subject: Temorary fix for phpdbg segfault while use zend_mm_set_custom_handlers
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~753
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=96f7a33df6e72dc855b82140ab10ddeaaf19b20c;p=php

Temorary fix for phpdbg segfault while use zend_mm_set_custom_handlers
---

diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index b066eb0b1f..6701ca4902 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) {
+			heap->_free(heap);
+		}
 		return;
 	}
 #endif
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
index 74bf84adff..a12811fb87 100644
--- a/sapi/phpdbg/phpdbg.c
+++ b/sapi/phpdbg/phpdbg.c
@@ -983,7 +983,14 @@ void *phpdbg_malloc_wrapper(size_t size) /* {{{ */
 
 void phpdbg_free_wrapper(void *p) /* {{{ */
 {
-	zend_mm_free(phpdbg_mm_get_heap(), p);
+	zend_mm_heap *heap = phpdbg_mm_get_heap();
+	if (UNEXPECTED(heap == p)) {
+		/* TODO: heap maybe allocated by mmap(zend_mm_init) or malloc(USE_ZEND_ALLOC=0) 
+		 * let's prevent it from segfault for now
+		 */
+	} else {
+		zend_mm_free(heap, p);
+	}
 } /* }}} */
 
 void *phpdbg_realloc_wrapper(void *ptr, size_t size) /* {{{ */