diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2017-11-23 14:16:58 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-24 16:12:26 +0900 |
| commit | a25b9085043b8029169b4d5b172b78ca3f38fb37 (patch) | |
| tree | 806946c9755062cb3a37f2c68f81429e01311ead /t/t7810-grep.sh | |
| parent | ce9a257031ca1cf3496c5bb1cd0d4b5ecb8379f2 (diff) | |
| download | git-a25b9085043b8029169b4d5b172b78ca3f38fb37.tar.gz | |
grep: fix segfault under -P + PCRE2 <=10.30 + (*NO_JIT)ab/pcre2-grep
Fix a bug in the compilation of PCRE2 patterns under JIT (the most
common runtime configuration). Any pattern with a (*NO_JIT) verb would
segfault in any currently released PCRE2 version:
$ git grep -P '(*NO_JIT)hi.*there'
Segmentation fault
That this segfaulted was a bug in PCRE2 itself, after reporting it[1]
on pcre-dev it's been fixed in a yet-to-be-released version of
PCRE (presumably released first as 10.31). Now it'll die with:
$ git grep -P '(*NO_JIT)hi.*there'
fatal: pcre2_jit_match failed with error code -45: bad JIT option
But the cause of the bug is in our own code dating back to my
94da9193a6 ("grep: add support for PCRE v2", 2017-06-01).
As explained at more length in the comment being added here, it isn't
sufficient to just check pcre2_config() to see whether the JIT should
be used, pcre2_pattern_info() also has to be asked.
This is something I discovered myself when fiddling around with PCRE2
verbs in patterns passed to git. I don't expect that any user of git
has encountered this given the obscurity of passing PCRE2 verbs
through to the library, along with the relative obscurity of (*NO_JIT)
itself.
1. "How am I supposed to use PCRE2 JIT in the face of (*NO_JIT) ?"
(<CACBZZX5mMqDuWuFmi7sRBp3wH6CFyd-ghACukd=v0NN=rBMnJg@mail.gmail.com> &
https://lists.exim.org/lurker/thread/20171123.101502.7f0d38ca.en.html)
on the pcre-dev mailing list
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7810-grep.sh')
| -rwxr-xr-x | t/t7810-grep.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh index 2a6679c2f5..c8ff50cc30 100755 --- a/t/t7810-grep.sh +++ b/t/t7810-grep.sh @@ -1110,6 +1110,12 @@ test_expect_success PCRE 'grep -P pattern' ' test_cmp expected actual ' +test_expect_success LIBPCRE2 "grep -P with (*NO_JIT) doesn't error out" ' + git grep -P "(*NO_JIT)\p{Ps}.*?\p{Pe}" hello.c >actual && + test_cmp expected actual + +' + test_expect_success !PCRE 'grep -P pattern errors without PCRE' ' test_must_fail git grep -P "foo.*bar" ' |