|
 |
f5aba26 |
From 68b518ae703afcc672071e2bf65e4600bb2f2bfb Mon Sep 17 00:00:00 2001
|
|
|
f5aba26 |
From: zherczeg <zherczeg@6239d852-aaf2-0410-a92c-79f79f948069>
|
|
|
f5aba26 |
Date: Fri, 4 Jun 2021 12:55:49 +0000
|
|
|
f5aba26 |
Subject: [PATCH] Fix invalid single character repetition issues in JIT.
|
|
|
f5aba26 |
|
|
|
f5aba26 |
git-svn-id: svn://vcs.pcre.org/pcre2/code/trunk@1315 6239d852-aaf2-0410-a92c-79f79f948069
|
|
|
f5aba26 |
---
|
|
|
f5aba26 |
src/pcre2_jit_compile.c | 10 ++++++----
|
|
|
f5aba26 |
src/pcre2_jit_test.c | 1 +
|
|
|
f5aba26 |
|
|
|
f5aba26 |
diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
|
|
|
f5aba26 |
index ae0d9a9..a3f7ebe 100644
|
|
|
f5aba26 |
--- a/src/pcre2_jit_compile.c
|
|
|
f5aba26 |
+++ b/src/pcre2_jit_compile.c
|
|
|
f5aba26 |
@@ -1236,15 +1236,16 @@ start:
|
|
|
f5aba26 |
|
|
|
f5aba26 |
return: current number of iterators enhanced with fast fail
|
|
|
f5aba26 |
*/
|
|
|
f5aba26 |
-static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start, sljit_s32 depth, int start)
|
|
|
f5aba26 |
+static int detect_early_fail(compiler_common *common, PCRE2_SPTR cc, int *private_data_start,
|
|
|
f5aba26 |
+ sljit_s32 depth, int start, BOOL fast_forward_allowed)
|
|
|
f5aba26 |
{
|
|
|
f5aba26 |
PCRE2_SPTR begin = cc;
|
|
|
f5aba26 |
PCRE2_SPTR next_alt;
|
|
|
f5aba26 |
PCRE2_SPTR end;
|
|
|
f5aba26 |
PCRE2_SPTR accelerated_start;
|
|
|
f5aba26 |
+BOOL prev_fast_forward_allowed;
|
|
|
f5aba26 |
int result = 0;
|
|
|
f5aba26 |
int count;
|
|
|
f5aba26 |
-BOOL fast_forward_allowed = TRUE;
|
|
|
f5aba26 |
|
|
|
f5aba26 |
SLJIT_ASSERT(*cc == OP_ONCE || *cc == OP_BRA || *cc == OP_CBRA);
|
|
|
f5aba26 |
SLJIT_ASSERT(*cc != OP_CBRA || common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] != 0);
|
|
|
f5aba26 |
@@ -1476,6 +1477,7 @@ do
|
|
|
f5aba26 |
case OP_CBRA:
|
|
|
f5aba26 |
end = cc + GET(cc, 1);
|
|
|
f5aba26 |
|
|
|
f5aba26 |
+ prev_fast_forward_allowed = fast_forward_allowed;
|
|
|
f5aba26 |
fast_forward_allowed = FALSE;
|
|
|
f5aba26 |
if (depth >= 4)
|
|
|
f5aba26 |
break;
|
|
|
f5aba26 |
@@ -1484,7 +1486,7 @@ do
|
|
|
f5aba26 |
if (*end != OP_KET || (*cc == OP_CBRA && common->optimized_cbracket[GET2(cc, 1 + LINK_SIZE)] == 0))
|
|
|
f5aba26 |
break;
|
|
|
f5aba26 |
|
|
|
f5aba26 |
- count = detect_early_fail(common, cc, private_data_start, depth + 1, count);
|
|
|
f5aba26 |
+ count = detect_early_fail(common, cc, private_data_start, depth + 1, count, prev_fast_forward_allowed);
|
|
|
f5aba26 |
|
|
|
f5aba26 |
if (PRIVATE_DATA(cc) != 0)
|
|
|
f5aba26 |
common->private_data_ptrs[begin - common->start] = 1;
|
|
|
f5aba26 |
@@ -13657,7 +13659,7 @@ memset(common->private_data_ptrs, 0, total_length * sizeof(sljit_s32));
|
|
|
f5aba26 |
private_data_size = common->cbra_ptr + (re->top_bracket + 1) * sizeof(sljit_sw);
|
|
|
f5aba26 |
|
|
|
f5aba26 |
if ((re->overall_options & PCRE2_ANCHORED) == 0 && (re->overall_options & PCRE2_NO_START_OPTIMIZE) == 0 && !common->has_skip_in_assert_back)
|
|
|
f5aba26 |
- detect_early_fail(common, common->start, &private_data_size, 0, 0);
|
|
|
f5aba26 |
+ detect_early_fail(common, common->start, &private_data_size, 0, 0, TRUE);
|
|
|
f5aba26 |
|
|
|
f5aba26 |
set_private_data_ptrs(common, &private_data_size, ccend);
|
|
|
f5aba26 |
|
|
|
f5aba26 |
diff --git a/src/pcre2_jit_test.c b/src/pcre2_jit_test.c
|
|
|
f5aba26 |
index d935887..f748016 100644
|
|
|
f5aba26 |
--- a/src/pcre2_jit_test.c
|
|
|
f5aba26 |
+++ b/src/pcre2_jit_test.c
|
|
|
f5aba26 |
@@ -351,6 +351,7 @@ static struct regression_test_case regression_test_cases[] = {
|
|
|
f5aba26 |
{ MU, A, 0, 0, ".[ab]*a", "xxa" },
|
|
|
f5aba26 |
{ MU, A, 0, 0, ".[ab]?.", "xx" },
|
|
|
f5aba26 |
{ MU, A, 0, 0, "_[ab]+_*a", "_aa" },
|
|
|
f5aba26 |
+ { MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" },
|
|
|
f5aba26 |
|
|
|
f5aba26 |
/* Bracket repeats with limit. */
|
|
|
f5aba26 |
{ MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" },
|
|
|
f5aba26 |
--
|
|
|
f5aba26 |
2.31.1
|
|
|
f5aba26 |
|