From: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, avarab@gmail.com, Johannes.Schindelin@gmx.de
Subject: [PATCH] grep: skip UTF8 checks explicitally
Date: Sun, 21 Jul 2019 11:31:15 -0700 [thread overview]
Message-ID: <20190721183115.14985-1-carenas@gmail.com> (raw)
Usually PCRE is compiled with JIT support, and therefore the code
path used includes calling pcre2_jit_match (for PCRE2), that ignores
invalid UTF-8 in the corpus.
Make that option explicit so it can be also used when JIT is not
enabled and pcre2_match is called instead, preventing `git grep`
to abort when hitting the first binary blob in a fixed match
after ed0479ce3d ("Merge branch 'ab/no-kwset' into next", 2019-07-15)
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
---
grep.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/grep.c b/grep.c
index fc0ed73ef3..146093f590 100644
--- a/grep.c
+++ b/grep.c
@@ -409,7 +409,7 @@ static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt)
static int pcre1match(struct grep_pat *p, const char *line, const char *eol,
regmatch_t *match, int eflags)
{
- int ovector[30], ret, flags = 0;
+ int ovector[30], ret, flags = PCRE_NO_UTF8_CHECK;
if (eflags & REG_NOTBOL)
flags |= PCRE_NOTBOL;
@@ -554,7 +554,7 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
static int pcre2match(struct grep_pat *p, const char *line, const char *eol,
regmatch_t *match, int eflags)
{
- int ret, flags = 0;
+ int ret, flags = PCRE2_NO_UTF_CHECK;
PCRE2_SIZE *ovector;
PCRE2_UCHAR errbuf[256];
--
2.22.0
next reply other threads:[~2019-07-21 18:31 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-21 18:31 Carlo Marcelo Arenas Belón [this message]
2019-07-21 18:34 ` [PATCH] grep: skip UTF8 checks explicitally Eric Sunshine
2019-07-22 11:55 ` Johannes Schindelin
2019-07-22 14:43 ` [PATCH] grep: skip UTF8 checks explicitly Carlo Marcelo Arenas Belón
2019-07-24 2:10 ` Junio C Hamano
2019-07-24 10:50 ` Johannes Schindelin
2019-07-24 16:08 ` Junio C Hamano
2019-08-28 14:54 ` [PATCH v2] " Carlo Marcelo Arenas Belón
2019-08-28 16:57 ` Carlo Arenas
2019-09-09 15:07 ` Carlo Arenas
2019-09-09 18:49 ` Junio C Hamano
2019-07-22 19:42 ` [PATCH] grep: skip UTF8 checks explicitally Ævar Arnfjörð Bjarmason
2019-07-23 3:50 ` Carlo Arenas
2019-07-23 12:46 ` Johannes Schindelin
2019-07-24 1:47 ` Carlo Arenas
2019-07-24 10:47 ` Johannes Schindelin
2019-07-24 18:22 ` Ævar Arnfjörð Bjarmason
2019-07-24 21:04 ` Junio C Hamano
2019-07-25 9:48 ` Johannes Schindelin
2019-07-25 13:02 ` Junio C Hamano
2019-07-25 18:22 ` Johannes Schindelin
2019-07-26 15:15 ` Ævar Arnfjörð Bjarmason
2019-07-26 15:53 ` Carlo Arenas
2019-07-26 20:05 ` Ævar Arnfjörð Bjarmason
2019-07-26 16:19 ` Junio C Hamano
2019-07-26 19:40 ` Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190721183115.14985-1-carenas@gmail.com \
--to=carenas@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.