Commit: 4c6678d6058fd740a9e186b49f9daa72d09ed300 Author: Xinchen Hui <larue...@php.net> Sat, 15 Sep 2012 11:50:16 +0800 Parents: 1b13ff6ec7969999052ed1b5315f8651b633a617 Branches: PHP-5.3
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4c6678d6058fd740a9e186b49f9daa72d09ed300 Log: Fixed bug #63093 (Segfault while load extension failed in zts-build). Bugs: https://bugs.php.net/63093 Changed paths: M NEWS M Zend/zend_API.c Diff: diff --git a/NEWS b/NEWS index 7e52997..181e66d 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,8 @@ PHP NEWS ?? ??? 2012, PHP 5.3.18 - Core: + . Fixed bug #63093 (Segfault while load extension failed in zts-build). + (Laruence) . Fixed bug #62976 (Notice: could not be converted to int when comparing some builtin classes). (Laruence) . Fixed bug #61767 (Shutdown functions not called in certain error diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 70cf0c7..cf96743 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2122,7 +2122,9 @@ void module_destructor(zend_module_entry *module) /* {{{ */ /* Deinitilaise module globals */ if (module->globals_size) { #ifdef ZTS - ts_free_id(*module->globals_id_ptr); + if (*module->globals_id_ptr) { + ts_free_id(*module->globals_id_ptr); + } #else if (module->globals_dtor) { module->globals_dtor(module->globals_ptr TSRMLS_CC); -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
