From 9de4d53cf850e0fca625ce9d80c12bea5b2a5ab9 Mon Sep 17 00:00:00 2001 From: Zoltan Herczeg Date: Thu, 7 Dec 2023 09:03:24 +0000 Subject: [PATCH] Fix backreferences with unset backref and non-greedy iterators in JIT --- ChangeLog | 2 ++ src/pcre2_jit_compile.c | 3 ++- src/pcre2_jit_test.c | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 98f56a3ed..4da35db82 100644 --- a/ChangeLog +++ b/ChangeLog @@ -189,6 +189,8 @@ in particular k and s. 51. Fix accept and endanchored interaction in JIT. +52. Fix backreferences with unset backref and non-greedy iterators in JIT. + Version 10.42 11-December-2022 ------------------------------ diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c index 0f445e1af..e1daa1e7a 100644 --- a/src/pcre2_jit_compile.c +++ b/src/pcre2_jit_compile.c @@ -9653,7 +9653,8 @@ else { if (ref) { - add_jump(compiler, &backtrack->own_backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1))); + if (!common->unset_backref) + add_jump(compiler, &backtrack->own_backtracks, CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(1))); zerolength = CMP(SLJIT_EQUAL, TMP1, 0, SLJIT_MEM1(SLJIT_SP), OVECTOR(offset + 1)); } else diff --git a/src/pcre2_jit_test.c b/src/pcre2_jit_test.c index 0974d19c2..9b63c8ee3 100644 --- a/src/pcre2_jit_test.c +++ b/src/pcre2_jit_test.c @@ -596,6 +596,7 @@ static struct regression_test_case regression_test_cases[] = { { CMU | PCRE2_DUPNAMES, A, 0, 0, "(?:(?AA)|(?BB))\\k{0,3}?M", "aaaaaabbbbbbaabbbbbbbbbbm" }, { CMU | PCRE2_DUPNAMES, A, 0, 0, "(?:(?AA)|(?BB))\\k{2,3}?", "aaaabbbbaaaabbbbbbbbbb" }, { MU | PCRE2_MATCH_UNSET_BACKREF, A, 0, 0, "(a)|\\1+c", "xxc" }, + { MU | PCRE2_MATCH_UNSET_BACKREF, A, 0, 0, "\\1+?()", "" }, /* Assertions. */ { MU, A, 0, 0, "(?=xx|yy|zz)\\w{4}", "abczzdefg" },