зеркало из https://github.com/microsoft/git.git
Merge branch 'rs/pcre-invalid-utf8-fix-fix'
Workaround we have for versions of PCRE2 before their version 10.36 were in effect only for their versions newer than 10.36 by mistake, which has been corrected. * rs/pcre-invalid-utf8-fix-fix: grep: fix triggering PCRE2_NO_START_OPTIMIZE workaround
This commit is contained in:
Коммит
5c4f3804a7
2
grep.c
2
grep.c
|
@ -295,7 +295,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
|
|||
if (!opt->ignore_locale && is_utf8_locale() && !literal)
|
||||
options |= (PCRE2_UTF | PCRE2_MATCH_INVALID_UTF);
|
||||
|
||||
#ifdef GIT_PCRE2_VERSION_10_36_OR_HIGHER
|
||||
#ifndef GIT_PCRE2_VERSION_10_36_OR_HIGHER
|
||||
/* Work around https://bugs.exim.org/show_bug.cgi?id=2642 fixed in 10.36 */
|
||||
if (PCRE2_MATCH_INVALID_UTF && options & (PCRE2_UTF | PCRE2_CASELESS))
|
||||
options |= PCRE2_NO_START_OPTIMIZE;
|
||||
|
|
Загрузка…
Ссылка в новой задаче