archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixed bug #76850 Exit code mangled by set locale/preg_match

Browse source
This commit is contained in:
Anatol Belski 2018-09-08 21:35:23 +02:00
parent 58e2f5ead1
commit c6ddd45650
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) { if (key != regex) {
tables = (uint8_t *)zend_hash_find_ptr(&char_tables, BG(locale_string)); tables = (uint8_t *)zend_hash_find_ptr(&char_tables, BG(locale_string));
if (!tables) { if (!tables) {
zend_string *_k;
tables = pcre2_maketables(gctx); tables = pcre2_maketables(gctx);
if (UNEXPECTED(!tables)) { if (UNEXPECTED(!tables)) {
php_error_docref(NULL,E_WARNING, "Failed to generate locale character 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); efree(pattern);
return NULL; 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); pcre2_set_character_tables(cctx, tables);
} }