From dc3822c3431ec3229ad439c3e4e4b956218777af Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 27 Dec 2017 12:51:50 +0800 Subject: [PATCH 1/2] Fixed bug #75735 ([embed SAPI] Segmentation fault in sapi_register_post_entry) --- NEWS | 4 ++++ TSRM/TSRM.h | 2 ++ sapi/embed/php_embed.c | 1 + 3 files changed, 7 insertions(+) diff --git a/NEWS b/NEWS index 478d8893252..9d44be5ac3a 100644 --- a/NEWS +++ b/NEWS @@ -13,6 +13,10 @@ PHP NEWS . Fixed bug #75671 (pg_version() crashes when called on a connection to cockroach). (magicaltux at gmail dot com) +- SAPI: + . Fixed bug #75735 ([embed SAPI] Segmentation fault in + sapi_register_post_entry). (Laruence) + - SOAP: . Fixed bug #70469 (SoapClient generates E_ERROR even if exceptions=1 is used). (Anton Artamonov) diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h index f9bb2410501..458843a689a 100644 --- a/TSRM/TSRM.h +++ b/TSRM/TSRM.h @@ -174,8 +174,10 @@ TSRM_API void *tsrm_get_ls_cache(void); #define TSRMLS_CACHE_DEFINE() TSRM_TLS void *TSRMLS_CACHE = NULL; #if ZEND_DEBUG #define TSRMLS_CACHE_UPDATE() TSRMLS_CACHE = tsrm_get_ls_cache() +#define TSRMLS_CACHE_RESET() #else #define TSRMLS_CACHE_UPDATE() if (!TSRMLS_CACHE) TSRMLS_CACHE = tsrm_get_ls_cache() +#define TSRMLS_CACHE_RESET() TSRMLS_CACHE = NULL #endif #define TSRMLS_CACHE _tsrm_ls_cache diff --git a/sapi/embed/php_embed.c b/sapi/embed/php_embed.c index e444610d774..e2a27a192ce 100644 --- a/sapi/embed/php_embed.c +++ b/sapi/embed/php_embed.c @@ -227,6 +227,7 @@ EMBED_SAPI_API void php_embed_shutdown(void) sapi_shutdown(); #ifdef ZTS tsrm_shutdown(); + TSRMLS_CACHE_RESET(); #endif if (php_embed_module.ini_entries) { free(php_embed_module.ini_entries); From 14304faae26479763d14addafbd0ed975b358404 Mon Sep 17 00:00:00 2001 From: Xinchen Hui Date: Wed, 27 Dec 2017 12:52:25 +0800 Subject: [PATCH 2/2] Updated NEWS --- NEWS | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS b/NEWS index 2000094a76d..9237ffdbe2f 100644 --- a/NEWS +++ b/NEWS @@ -26,6 +26,10 @@ PHP NEWS . Fixed bug #75671 (pg_version() crashes when called on a connection to cockroach). (magicaltux at gmail dot com) +- SAPI: + . Fixed bug #75735 ([embed SAPI] Segmentation fault in + sapi_register_post_entry). (Laruence) + - SOAP: . Fixed bug #70469 (SoapClient generates E_ERROR even if exceptions=1 is used). (Anton Artamonov)