com php-src: Partially fix bug #70492: Zend/zend_alloc.c sapi/phpdbg/phpdbg.c
| From: | Nikita Popov | Date: | Wed, 14 Dec 2016 17:11:27 +0000 |
| Subject: | com php-src: Partially fix bug #70492: Zend/zend_alloc.c sapi/phpdbg/phpdbg.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-96332@lists.php.net to get a copy of this message | ||
Commit: f99bf7036033f4dd95b8f56c8697af7f8963ab9f
Author: Nikita Popov <nikic@php.net> Wed, 14 Dec 2016 18:10:36 +0100
Parents: d663296e3bb5501f15c395990d11c49acf03ef8d
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f99bf7036033f4dd95b8f56c8697af7f8963ab9f
Log:
Partially fix bug #70492
The libmagic portion is missing.
Bugs:
https://bugs.php.net/70492
Changed paths:
M Zend/zend_alloc.c
M sapi/phpdbg/phpdbg.c
Diff:
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 937340d..be82854 100644
--- 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
index 7eeaf48..9cc6028 100644
--- 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);
}
} /* }}} */