diff options
| author | Anatol Belski <ab@php.net> | 2014-12-16 08:26:34 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-16 08:26:34 +0100 |
| commit | c0cb3a1dc400e6d5120b4b5f941969b7865a5160 (patch) | |
| tree | ef7a80f8707405a44b1d47644b80be4d066b1b4b | |
| parent | 209a7a27a5a9a9dc4e32ffa39a2ef971a97d2878 (diff) | |
| download | php-git-c0cb3a1dc400e6d5120b4b5f941969b7865a5160.tar.gz | |
depending on declaration the tsrm cache pointer might be unavailable
during shutdown when the main thread frees all the other threads
resources. Even otherwise, exact resource passed to the dtor should
be freed, not the one from the current thread.
| -rw-r--r-- | Zend/zend_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 1ce393f950..6ee516176f 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -2403,7 +2403,7 @@ static void alloc_globals_ctor(zend_alloc_globals *alloc_globals) #ifdef ZTS static void alloc_globals_dtor(zend_alloc_globals *alloc_globals) { - shutdown_memory_manager(1, 1); + zend_mm_shutdown(alloc_globals->mm_heap, 1, 1); } #endif |