archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix phpdbg ZTS shutdown with USE_ZEND_ALLOC

Browse source
This commit is contained in:
Bob Weinand 2016-11-13 12:25:43 +01:00
parent 057ae377a0
commit dbd504eaa9
1 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
sapi/phpdbg/phpdbg.c
View file

@ -1397,6 +1397,10 @@ int main(int argc, char **argv) /* {{{ */
char *read_from_stdin = NULL;
zend_string *backup_phpdbg_compile = NULL;
zend_bool show_help = 0, show_version = 0;
void* (*_malloc)(size_t);
void (*_free)(void*);
void* (*_realloc)(void*, size_t);
#ifndef _WIN32
struct sigaction sigio_struct;
@ -1684,9 +1688,6 @@ phpdbg_main:
EXCEPTION_POINTERS *xp;
__try {
#endif
void* (*_malloc)(size_t);
void (*_free)(void*);
void* (*_realloc)(void*, size_t);
if (show_version || show_help) {
/* It ain't gonna proceed to real execution anyway,
@ -1767,6 +1768,8 @@ phpdbg_main:
zend_mm_set_custom_handlers(mm_heap, _malloc, _free, _realloc);
}
_free = PHPDBG_G(original_free_function);
phpdbg_init_list();
@ -2167,10 +2170,6 @@ phpdbg_out:
sapi_shutdown();
#ifdef ZTS
ts_free_id(phpdbg_globals_id);
#endif
if (sapi_name) {
free(sapi_name);
}
@ -2182,6 +2181,13 @@ free_and_return:
}
#ifdef ZTS
/* reset to original handlers - otherwise PHPDBG_G() in phpdbg_watch_efree will be segfaulty (with e.g. USE_ZEND_ALLOC=0) */
if (!use_mm_wrappers) {
zend_mm_set_custom_handlers(zend_mm_get_heap(), _malloc, _free, _realloc);
}
ts_free_id(phpdbg_globals_id);
tsrm_shutdown();
#endif