php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-17 13:01:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3'

Browse Source 
* PHP-7.3:
  Fixed bug #76850 Exit code mangled by set locale/preg_match
This commit is contained in:
Anatol Belski
2018-09-08 21:38:05 +02:00
parent a303089ffe c6ddd45650
commit 3de0ba7cbf
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ext/pcre/php_pcre.c
View File

@@ -729,6 +729,7 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex)
if (key != regex) {
tables = (uint8_t *)zend_hash_find_ptr(&char_tables, BG(locale_string));
if (!tables) {
zend_string *_k;
tables = pcre2_maketables(gctx);
if (UNEXPECTED(!tables)) {
php_error_docref(NULL,E_WARNING, "Failed to generate locale character tables");
@@ -737,7 +738,9 @@ PHPAPI pcre_cache_entry* pcre_get_compiled_regex_cache(zend_string *regex)
efree(pattern);
return NULL;
}
zend_hash_add_ptr(&char_tables, BG(locale_string), (void *)tables);
_k = zend_string_dup(BG(locale_string), 1);
zend_hash_add_ptr(&char_tables, _k, (void *)tables);
zend_string_release(_k);
}
pcre2_set_character_tables(cctx, tables);
}