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

Merge branch 'PHP-7.4'

Browse source
This commit is contained in:
Nikita Popov 2020-06-16 14:32:33 +02:00
commit bbe74a6e3a
2 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/mbstring/php_mbregex.c
View file

@ -1357,7 +1357,7 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
size_t n, i, pos, len;
/* Stored as int* in the OnigRegion struct */
int beg, end;
OnigOptionType option;
OnigOptionType option = 0;
OnigUChar *str;
OnigSyntaxType *syntax;
@ -1365,11 +1365,11 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
RETURN_THROWS();
}
option = MBREX(regex_default_options);
if (arg_options) {
option = 0;
_php_mb_regex_init_options(arg_options, arg_options_len, &option, &syntax, NULL);
} else {
option |= MBREX(regex_default_options);
syntax = MBREX(regex_default_syntax);
}
if (MBREX(search_regs)) {
@ -1379,7 +1379,7 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode)
if (arg_pattern) {
/* create regex pattern buffer */
if ((MBREX(search_re) = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, MBREX(regex_default_syntax))) == NULL) {
if ((MBREX(search_re) = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, syntax)) == NULL) {
RETURN_FALSE;
}
}