Re: [PATCH v2] grep: avoid setting UTF mode when dangerous with PCRE
- From
Hamza Mahfooz <someguy@effective-light.com>
- Date
- Nov 18, 2021, 12:49 UTC
- Message-ID
- <HAQR2R.KZGF0ERBQ2Z72@effective-light.com>
- In-Reply-To
- <CAPUEsphbA0Qrnt-MdxyYT2OMrnXnbi0tN5_YNqLypCqDqZyeWg@mail.gmail.com>
If none of the patches that are trying to fix our usage of PCRE2 are ACKed. It would be preferable (from my perspective) to revert only ae39ba431a (grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data, 2021-10-15) and disable the feature (for the time being) if PCRE2 is selected, like so:
diff --git a/pretty.c b/pretty.c index 1af5b093ae..a53d008d1e 100644 --- a/pretty.c +++ b/pretty.c @@ -452,7 +452,7 @@ static void append_line_with_color(struct strbuf *sb, struct grep_opt *opt, buf = line; eol = buf + linelen; - if (!opt || !want_color(color) || opt->invert) + if (!opt || !want_color(color) || opt->invert || opt->pcre2) goto end; line_color = opt->colors[GREP_COLOR_SELECTED]; On Thu, Nov 18 2021 at 02:15:49 AM -0800, Carlo Arenas <carenas@gmail.com> wrote: > > This will likely need at least some ACKs. > > Apologies for the noise. > > Carlo