From 7624fb6e8b16f1517ec451ae0880b48f524c4972 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Tue, 23 Dec 2014 14:38:30 +0300 Subject: Fixed possible crash (pcre cache must keep permanent strings) --- ext/pcre/php_pcre.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'ext/pcre/php_pcre.c') diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index d3eb4d49fe..5701ae1a0c 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -439,7 +439,11 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex) new_entry.preg_options = poptions; new_entry.compile_options = coptions; #if HAVE_SETLOCALE - new_entry.locale = BG(locale_string) ? zend_string_dup(BG(locale_string), 1) : NULL; + new_entry.locale = BG(locale_string) ? + ((GC_FLAGS(BG(locale_string)) & IS_STR_PERSISTENT) ? + zend_string_copy(BG(locale_string)) : + zend_string_init(BG(locale_string)->val, BG(locale_string)->len, 1)) : + NULL; new_entry.tables = tables; #endif -- cgit v1.2.1