From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 23 Dec 2014 11:38:30 +0000 (+0300)
Subject: Fixed possible crash (pcre cache must keep permanent strings)
X-Git-Tag: PRE_PHP7_REMOVALS~35^2~29
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7624fb6e8b16f1517ec451ae0880b48f524c4972;p=php

Fixed possible crash (pcre cache must keep permanent strings)
---

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