зеркало из https://github.com/microsoft/git.git
grep: fix triggering PCRE2_NO_START_OPTIMIZE workaround
PCRE2 bug 2642 was fixed in version 10.36. Our95ca1f987e
(grep/pcre2: better support invalid UTF-8 haystacks, 2021-01-24) worked around it on older versions by setting the flag PCRE2_NO_START_OPTIMIZE.797c359978
(grep/pcre2: use compile-time PCREv2 version test, 2021-02-18) switched it around to set the flag on 10.36 and higher instead, while it claimed to use "the same test done at compile-time". Switch the condition back to apply the workaround on PCRE2 versions _before_ 10.36. Signed-off-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
c1760352e0
Коммит
97169fc361
2
grep.c
2
grep.c
|
@ -386,7 +386,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
|
|||
!(!opt->ignore_case && (p->fixed || p->is_fixed)))
|
||||
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;
|
||||
|
|
Загрузка…
Ссылка в новой задаче