Fixed possible crash (pcre cache must keep permanent strings)

diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c
index d3eb4d49fea8e8b065ef4d38a1d9511dc85e656f..5701ae1a0c9e09ca4033f973a45569aa2165833d 100644 (file)
--- 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