From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Carlo Marcelo Arenas Belón" <carenas@gmail.com>,
git@vger.kernel.org, avarab@gmail.com
Subject: Re: [PATCH] grep: skip UTF8 checks explicitly
Date: Wed, 24 Jul 2019 12:50:17 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1907241248000.21907@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqa7d4rxm9.fsf@gitster-ct.c.googlers.com>
[-- Attachment #1: Type: text/plain, Size: 2666 bytes --]
Hi Junio,
On Tue, 23 Jul 2019, Junio C Hamano wrote:
> Carlo Marcelo Arenas Belón <carenas@gmail.com> writes:
>
> > 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)
> >
> > Reviewed-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> > Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
> > ---
> > V2: spelling fixes from Eric Sunshine
>
> Good. I was expecting fallouts like this from our recent push to
> aggressively use pcre and that was why I merged ab/no-kwset before
> I felt comfortable, so that we can have longer exposure. It seems
> to be paying off.
I agree: it pays off quite nicely.
> So with JIT, PCRE_NO_UTF8_CHECK is on by default, but without, we
> need to give the option explicitly, and because it is on by default
> in the JIT case, it would not hurt to explicitly pass it?
>
> That makes perfect sense to me.
My reading of the situation is slightly different. I think
PCRE_NO_UTF8_CHECK is off by default, but it only makes a difference in
the non-JIT'ed code path. Since we use PCRE2's JIT when possible
(because it leads to a quite nice performance improvement), we usually
don't see those warnings. Carlo's patch makes the non-JIT'ed code path
behave the same as our preferred code path.
Thanks,
Dscho
>
> > 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];
>
next prev parent reply other threads:[~2019-07-24 10:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-21 18:31 [PATCH] grep: skip UTF8 checks explicitally Carlo Marcelo Arenas Belón
2019-07-21 18:34 ` 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 [this message]
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1907241248000.21907@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=avarab@gmail.com \
--cc=carenas@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).