diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-29 12:50:40 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-01-29 12:50:40 +0100 |
| commit | b3f07afabc32cef19c092524fd705ca1cbde566b (patch) | |
| tree | 68142f60ae31a62adea660230ff54d135d462761 | |
| parent | 5589bf4d4af830b2a081475cf8065bf1ed9cf19a (diff) | |
| parent | 392ad206a4f63fedf61d8086e390c73de8b72767 (diff) | |
| download | php-git-b3f07afabc32cef19c092524fd705ca1cbde566b.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Fix use of mb_ereg_search_getregs() after invalid pattern
| -rw-r--r-- | ext/mbstring/php_mbregex.c | 8 | ||||
| -rw-r--r-- | ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt | 17 |
2 files changed, 22 insertions, 3 deletions
diff --git a/ext/mbstring/php_mbregex.c b/ext/mbstring/php_mbregex.c index 366aad23cf..11f63858b2 100644 --- a/ext/mbstring/php_mbregex.c +++ b/ext/mbstring/php_mbregex.c @@ -1440,6 +1440,11 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode) _php_mb_regex_init_options(arg_options, arg_options_len, &option, &syntax, NULL); } + if (MBREX(search_regs)) { + onig_region_free(MBREX(search_regs), 1); + MBREX(search_regs) = NULL; + } + if (arg_pattern) { /* create regex pattern buffer */ if ((MBREX(search_re) = php_mbregex_compile_pattern(arg_pattern, arg_pattern_len, option, MBREX(current_mbctype), MBREX(regex_default_syntax))) == NULL) { @@ -1465,9 +1470,6 @@ _php_mb_regex_ereg_search_exec(INTERNAL_FUNCTION_PARAMETERS, int mode) RETURN_FALSE; } - if (MBREX(search_regs)) { - onig_region_free(MBREX(search_regs), 1); - } MBREX(search_regs) = onig_region_new(); err = _php_mb_onig_search(MBREX(search_re), str, str + len, str + pos, str + len, MBREX(search_regs), 0); diff --git a/ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt b/ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt new file mode 100644 index 0000000000..7fe6d31128 --- /dev/null +++ b/ext/mbstring/tests/mb_ereg_search_invalid_pattern.phpt @@ -0,0 +1,17 @@ +--TEST-- +mb_ereg_search() with invalid pattern should discard old matches +--FILE-- +<?php + +mb_ereg_search_init(''); +var_dump(mb_ereg_search('')); +var_dump(mb_ereg_search("\xff")); +var_dump(mb_ereg_search_getregs()); + +?> +--EXPECTF-- +bool(true) + +Warning: mb_ereg_search(): Pattern is not valid under UTF-8 encoding in %s on line %d +bool(false) +bool(false) |