com php-src: Fixed possible crash (pcre cache must keep permanent strings): ext/pcre/php_pcre.c

From: Date: Tue, 23 Dec 2014 11:38:30 +0000
Subject: com php-src: Fixed possible crash (pcre cache must keep permanent strings): ext/pcre/php_pcre.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-83835@lists.php.net to get a copy of this message
Commit: 7624fb6e8b16f1517ec451ae0880b48f524c4972 Author: Dmitry Stogov <dmitry@zend.com> Tue, 23 Dec 2014 14:38:30 +0300 Parents: 62e29736023e7d555736501cd05f31463394babb Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=7624fb6e8b16f1517ec451ae0880b48f524c4972 Log: Fixed possible crash (pcre cache must keep permanent strings) Changed paths: M ext/pcre/php_pcre.c Diff: diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index d3eb4d4..5701ae1 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

« previous php.cvs (#83835) next »