[RFC PATCH 2/2] grep: fallback to interpreter if JIT fails with pcre2
- From
Carlo Marcelo Arenas Belón <carenas@gmail.com>
- Date
- Dec 9, 2018, 23:00 UTC
- Message-ID
- <20181209230024.43444-3-carenas@gmail.com>
- In-Reply-To
- <20181209230024.43444-1-carenas@gmail.com>
starting with 10.23, and as a side effect of the work for bug1749[1] (grep -P crash with seLinux), pcre2grep was modified to ignore any errors from pcre2_jit_compile so the interpreter could be used as a fallback
[1] https://bugs.exim.org/show_bug.cgi?id=1749
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> --- grep.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/grep.c b/grep.c index 5ccc0421a1..c751c8cc74 100644 --- a/grep.c +++ b/grep.c @@ -530,8 +530,11 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt pcre2_config(PCRE2_CONFIG_JIT, &p->pcre2_jit_on); if (p->pcre2_jit_on == 1) { jitret = pcre2_jit_compile(p->pcre2_pattern, PCRE2_JIT_COMPLETE); - if (jitret) - die("Couldn't JIT the PCRE2 pattern '%s', got '%d'\n", p->pattern, jitret); + if (jitret) { + /* JIT failed so fallback to the interpreter */ + p->pcre2_jit_on = 0; + return; + } /* * The pcre2_config(PCRE2_CONFIG_JIT, ...) call just
-- 2.20.0