grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34
Stephane is reporting[1] a regression introduced in git v2.40.0 that leads to 'git grep' segfaulting in his CI pipeline. It turns out, he's using an older version of libpcre2 that triggers a wild pointer dereference in the generated JIT code that was fixed in PCRE2 10.35. Instead of completely disabling the JIT compiler for the buggy version, just mask out the Unicode property handling as we used to do prior to commit acabd2048ee0 ("grep: correctly identify utf-8 characters with \{b,w} in -P"). [1] https://lore.kernel.org/git/7E83DAA1-F9A9-4151-8D07-D80EA6D59EEA@clumio.com/ Reported-by: Stephane Odul <stephane@clumio.com> Signed-off-by: Mathias Krause <minipli@grsecurity.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Mathias Krause committed
Mar 23, 2023 at 18:25 UTC
14b9a044798ebb3858a1f1a1377309a3d6054ac8
2 files changed
+12
grep.c
+9
@@ -295,6 +295,15 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
295
if (!opt->ignore_locale && is_utf8_locale() && !literal)
296
options |= (PCRE2_UTF | PCRE2_UCP | PCRE2_MATCH_INVALID_UTF);
297
298
+#ifndef GIT_PCRE2_VERSION_10_35_OR_HIGHER
299
+ /*
300
+ * Work around a JIT bug related to invalid Unicode character handling
301
+ * fixed in 10.35:
302
+ * https://github.com/PCRE2Project/pcre2/commit/c21bd977547d
303
+ */
304
+ options &= ~PCRE2_UCP;
305
+#endif
306
+
307
#ifndef GIT_PCRE2_VERSION_10_36_OR_HIGHER
308
/* Work around https://bugs.exim.org/show_bug.cgi?id=2642 fixed in 10.36 */
309
if (PCRE2_MATCH_INVALID_UTF && options & (PCRE2_UTF | PCRE2_CASELESS))
grep.h
+3
@@ -7,6 +7,9 @@
7
#if (PCRE2_MAJOR >= 10 && PCRE2_MINOR >= 36) || PCRE2_MAJOR >= 11
8
#define GIT_PCRE2_VERSION_10_36_OR_HIGHER
9
#endif
10
+#if (PCRE2_MAJOR >= 10 && PCRE2_MINOR >= 35) || PCRE2_MAJOR >= 11
11
+#define GIT_PCRE2_VERSION_10_35_OR_HIGHER
12
+#endif
13
#if (PCRE2_MAJOR >= 10 && PCRE2_MINOR >= 34) || PCRE2_MAJOR >= 11
14
#define GIT_PCRE2_VERSION_10_34_OR_HIGHER
15
#endif