diff options
| author | Xinchen Hui <laruence@php.net> | 2012-09-15 11:50:49 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-09-15 11:51:25 +0800 |
| commit | ee620e96736024218f50a6ff5267127509fd68d8 (patch) | |
| tree | 829bce403dfc8c091b1e0c4fa461b3f806a18645 /Zend/zend_API.c | |
| parent | 7609fb433afaef3b2d0279c673481f879842e92a (diff) | |
| parent | 4c6678d6058fd740a9e186b49f9daa72d09ed300 (diff) | |
| download | php-git-ee620e96736024218f50a6ff5267127509fd68d8.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index a231415547..3c9d59d692 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -2265,7 +2265,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); |