archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Add zend_string_concat2 API

Browse source
This commit is contained in:
Nikita Popov 2020-04-14 17:17:38 +02:00
parent 489a51bff0
commit 4fb705a03d
6 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ext/pcre/php_pcre.c
View file

@ -597,9 +597,9 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache_ex(zend_string *regex, in
if (locale_aware && BG(locale_string) &&
(ZSTR_LEN(BG(locale_string)) != 1 && ZSTR_VAL(BG(locale_string))[0] != 'C')) {
key = zend_string_alloc(ZSTR_LEN(regex) + ZSTR_LEN(BG(locale_string)) + 1, 0);
memcpy(ZSTR_VAL(key), ZSTR_VAL(BG(locale_string)), ZSTR_LEN(BG(locale_string)) + 1);
memcpy(ZSTR_VAL(key) + ZSTR_LEN(BG(locale_string)), ZSTR_VAL(regex), ZSTR_LEN(regex) + 1);
key = zend_string_concat2(
ZSTR_VAL(BG(locale_string)), ZSTR_LEN(BG(locale_string)),
ZSTR_VAL(regex), ZSTR_LEN(regex));
} else {
key = regex;
}