From 51f5e2d509e1ca4863ecc93a153366b02f51d647 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 9 Sep 2020 14:09:54 -0700 Subject: [PATCH 1/2] grep: fix PCRE JIT test when JIT not available Problem reported by Thomas Deutschmann (Bug#29446#23). * src/pcresearch.c (Pexecute): Diagnose PCRE_ERROR_RECURSIONLIMIT. * tests/pcre-jitstack: Treat recursion limit overflow like stack overflow. --- src/pcresearch.c | 3 +++ tests/pcre-jitstack | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pcresearch.c b/src/pcresearch.c index 2fcbf8e..e265083 100644 --- a/src/pcresearch.c +++ b/src/pcresearch.c @@ -311,6 +311,9 @@ Pexecute (void *vcp, char const *buf, size_t size, size_t *match_size, case PCRE_ERROR_MATCHLIMIT: die (EXIT_TROUBLE, 0, _("exceeded PCRE's backtracking limit")); + case PCRE_ERROR_RECURSIONLIMIT: + die (EXIT_TROUBLE, 0, _("exceeded PCRE's recursion limit")); + default: /* For now, we lump all remaining PCRE failures into this basket. If anyone cares to provide sample grep usage that can trigger diff --git a/tests/pcre-jitstack b/tests/pcre-jitstack index d5a621b..39cda92 100755 --- a/tests/pcre-jitstack +++ b/tests/pcre-jitstack @@ -56,7 +56,8 @@ if test $? != 1; then || fail=1 # If that failed due to stack overflow, don't cry foul. - test $fail = 1 && { grep -q 'stack overflow' err && fail=0 || cat err; } + overflow_pat="stack overflow|exceeded PCRE's recursion limit" + test $fail = 1 && { grep -Eq "$overflow_pat" err && fail=0 || cat err; } fi Exit $fail -- 2.17.1