archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Partially fix bug #70492

Browse source 
The libmagic portion is missing.
This commit is contained in:
Nikita Popov 2016-12-14 18:10:36 +01:00
parent d663296e3b
commit f99bf70360
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Zend/zend_alloc.c
View file

@ -2343,7 +2343,7 @@ ZEND_API int is_zend_mm(void)
#endif #endif
} }
#if !ZEND_DEBUG && (!defined(_WIN32) || defined(__clang__)) #if !ZEND_DEBUG && defined(HAVE_BUILTIN_CONSTANT_P)
#undef _emalloc #undef _emalloc
#if ZEND_MM_CUSTOM #if ZEND_MM_CUSTOM

2
sapi/phpdbg/phpdbg.c
View file

@ -1300,7 +1300,7 @@ void phpdbg_free_wrapper(void *p ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) /* {{
*/ */
} else { } else {
phpdbg_watch_efree(p); 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);
} }
} /* }}} */ } /* }}} */