From 72b34e1372ff7a0bbca6bdca681b8aaa37b4a586 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 6 Oct 2014 13:38:13 +0200 Subject: [PATCH] fix leaking the empty_string in TS builds --- Zend/zend.c | 5 ++++- Zend/zend_string.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index 8a6e09ea04..2762b0922e 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -477,7 +477,10 @@ static void compiler_globals_dtor(zend_compiler_globals *compiler_globals TSRMLS compiler_globals->last_static_member = 0; #ifdef ZTS - zend_string_release(compiler_globals->empty_string); + if (NULL != compiler_globals->empty_string) { + free(compiler_globals->empty_string); + compiler_globals->empty_string = NULL; + } #endif } /* }}} */ diff --git a/Zend/zend_string.c b/Zend/zend_string.c index a4455e8da9..a2fe091695 100644 --- a/Zend/zend_string.c +++ b/Zend/zend_string.c @@ -80,7 +80,10 @@ void zend_interned_strings_dtor(TSRMLS_D) #ifndef ZTS zend_hash_destroy(&CG(interned_strings)); #else - zend_string_release(CG(empty_string)); + if (NULL != CG(empty_string)) { + free(CG(empty_string)); + CG(empty_string) = NULL; + } #endif } -- 2.50.1