com php-src: depending on declaration the tsrm cache pointer might be unavailable: Zend/zend_alloc.c
| From: | Anatol Belski | Date: | Tue, 16 Dec 2014 07:26:34 +0000 |
| Subject: | com php-src: depending on declaration the tsrm cache pointer might be unavailable: Zend/zend_alloc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83731@lists.php.net to get a copy of this message | ||
Commit: c0cb3a1dc400e6d5120b4b5f941969b7865a5160
Author: Anatol Belski <ab@php.net> Tue, 16 Dec 2014 08:26:34 +0100
Parents: 209a7a27a5a9a9dc4e32ffa39a2ef971a97d2878
Branches: native-tls
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c0cb3a1dc400e6d5120b4b5f941969b7865a5160
Log:
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.
Changed paths:
M Zend/zend_alloc.c
Diff:
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 1ce393f..6ee5161 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