diff options
| author | Anatol Belski <ab@php.net> | 2017-03-02 20:34:48 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2017-03-02 20:34:48 +0100 |
| commit | 1d4248af42f92787ec1de6fb5f22746cb343feef (patch) | |
| tree | 482c92718fed8b8b4a7f72090c7576b871f4997a | |
| parent | 494fc16184ba2899f799d13c9fc4e06e272133a4 (diff) | |
| parent | 18f7e262570b8766cf6d7f7e0990affe687fa098 (diff) | |
| download | php-git-1d4248af42f92787ec1de6fb5f22746cb343feef.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
improve signal globals consistency check for TS
| -rw-r--r-- | Zend/zend_signal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_signal.c b/Zend/zend_signal.c index 9a21831da2..e067c518e8 100644 --- a/Zend/zend_signal.c +++ b/Zend/zend_signal.c @@ -91,7 +91,7 @@ void zend_signal_handler_defer(int signo, siginfo_t *siginfo, void *context) #ifdef ZTS ZEND_TSRMLS_CACHE_UPDATE(); /* A signal could hit after TSRM shutdown, in this case globals are already freed. */ - if (NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) { + if (NULL == TSRMLS_CACHE || NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) { is_handling_safe = 0; } #endif @@ -181,7 +181,7 @@ static void zend_signal_handler(int signo, siginfo_t *siginfo, void *context) sigset_t sigset; zend_signal_entry_t p_sig; #ifdef ZTS - if (NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) { + if (NULL == TSRMLS_CACHE || NULL == TSRMG_BULK_STATIC(zend_signal_globals_id, zend_signal_globals_t *)) { p_sig.flags = 0; p_sig.handler = SIG_DFL; } else |