Partially fix bug #70492

nikic · nikic · commit f99bf7036033 · 2016-12-14T18:11:27.000+01:00
The libmagic portion is missing.
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
@@ -2343,7 +2343,7 @@ ZEND_API int is_zend_mm(void)
 #endif
 }
 
-#if !ZEND_DEBUG && (!defined(_WIN32) || defined(__clang__))
+#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P)
 #undef _emalloc
 
 #if ZEND_MM_CUSTOM
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c
@@ -1300,7 +1300,7 @@ void phpdbg_free_wrapper(void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) /* {{
 		 */
 	} else {
 		phpdbg_watch_efree(p);
-		return _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
+		_zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);
 	}
 } /* }}} */
 

Original file line number	Diff line number	Diff line change
`@@ -2343,7 +2343,7 @@ ZEND_API int is_zend_mm(void)`
`2343`	`2343`	`#endif`
`2344`	`2344`	`}`
`2345`	`2345`
`2346`		`-#if !ZEND_DEBUG && (!defined(_WIN32) \|\| defined(__clang__))`
	`2346`	`+#if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P)`
`2347`	`2347`	`#undef _emalloc`
`2348`	`2348`
`2349`	`2349`	`#if ZEND_MM_CUSTOM`
Original file line number	Diff line number	Diff line change
`@@ -1300,7 +1300,7 @@ void phpdbg_free_wrapper(void p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) / {{`
`1300`	`1300`	`*/`
`1301`	`1301`	`} else {`
`1302`	`1302`	`phpdbg_watch_efree(p);`
`1303`		`- return _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);`
	`1303`	`+ _zend_mm_free(heap, p ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);`
`1304`	`1304`	`}`
`1305`	`1305`	`} /* }}} */`
`1306`	`1306`