Skip to content

Commit 4c6678d

Browse files
committed
Fixed bug #63093 (Segfault while load extension failed in zts-build).
1 parent 1b13ff6 commit 4c6678d

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

NEWS

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ PHP NEWS
33
?? ??? 2012, PHP 5.3.18
44

55
- Core:
6+
. Fixed bug #63093 (Segfault while load extension failed in zts-build).
7+
(Laruence)
68
. Fixed bug #62976 (Notice: could not be converted to int when comparing
79
some builtin classes). (Laruence)
810
. Fixed bug #61767 (Shutdown functions not called in certain error

Zend/zend_API.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2122,7 +2122,9 @@ void module_destructor(zend_module_entry *module) /* {{{ */
21222122
/* Deinitilaise module globals */
21232123
if (module->globals_size) {
21242124
#ifdef ZTS
2125-
ts_free_id(*module->globals_id_ptr);
2125+
if (*module->globals_id_ptr) {
2126+
ts_free_id(*module->globals_id_ptr);
2127+
}
21262128
#else
21272129
if (module->globals_dtor) {
21282130
module->globals_dtor(module->globals_ptr TSRMLS_CC);

0 commit comments

Comments
 (0)