Compare commits
No commits in common. 'c9' and 'i9c-beta' have entirely different histories.
@ -1 +1,2 @@
|
||||
SOURCES/pcre2-10.40.tar.bz2
|
||||
SOURCES/pcre2-10.40.tar.bz2.sig
|
||||
|
||||
@ -1 +1,2 @@
|
||||
5a433f92b29083d0d8ccd4ec56e3afbe1fa09863 SOURCES/pcre2-10.40.tar.bz2
|
||||
3f85b8b83621de8649fb623eb3d11434e4c6f989 SOURCES/pcre2-10.40.tar.bz2.sig
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
From 44a4e60e0ad45d4c60b7da10e9e9531da75bb9a4 Mon Sep 17 00:00:00 2001
|
||||
From: Zoltan Herczeg <hzmester@freemail.hu>
|
||||
Date: Tue, 12 Jul 2022 08:35:38 +0000
|
||||
Subject: [PATCH] Fixed an issue in the backtracking optimization of character
|
||||
repeats in JIT
|
||||
|
||||
---
|
||||
src/pcre2_jit_compile.c | 20 ++++++++++----------
|
||||
src/pcre2_jit_test.c | 1 +
|
||||
3 files changed, 14 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/src/pcre2_jit_compile.c b/src/pcre2_jit_compile.c
|
||||
index e638c24..b3cffbe 100644
|
||||
--- a/src/pcre2_jit_compile.c
|
||||
+++ b/src/pcre2_jit_compile.c
|
||||
@@ -11517,19 +11517,19 @@ if (exact > 1)
|
||||
}
|
||||
}
|
||||
else if (exact == 1)
|
||||
- {
|
||||
compile_char1_matchingpath(common, type, cc, &backtrack->topbacktracks, TRUE);
|
||||
|
||||
- if (early_fail_type == type_fail_range)
|
||||
- {
|
||||
- OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr);
|
||||
- OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + (int)sizeof(sljit_sw));
|
||||
- OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, TMP2, 0);
|
||||
- OP2(SLJIT_SUB, TMP2, 0, STR_PTR, 0, TMP2, 0);
|
||||
- add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_LESS_EQUAL, TMP2, 0, TMP1, 0));
|
||||
+if (early_fail_type == type_fail_range)
|
||||
+ {
|
||||
+ /* Range end first, followed by range start. */
|
||||
+ OP1(SLJIT_MOV, TMP1, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr);
|
||||
+ OP1(SLJIT_MOV, TMP2, 0, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + (int)sizeof(sljit_sw));
|
||||
+ OP2(SLJIT_SUB, TMP1, 0, TMP1, 0, TMP2, 0);
|
||||
+ OP2(SLJIT_SUB, TMP2, 0, STR_PTR, 0, TMP2, 0);
|
||||
+ add_jump(compiler, &backtrack->topbacktracks, CMP(SLJIT_LESS_EQUAL, TMP2, 0, TMP1, 0));
|
||||
|
||||
- OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + (int)sizeof(sljit_sw), STR_PTR, 0);
|
||||
- }
|
||||
+ OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr, STR_PTR, 0);
|
||||
+ OP1(SLJIT_MOV, SLJIT_MEM1(SLJIT_SP), early_fail_ptr + (int)sizeof(sljit_sw), STR_PTR, 0);
|
||||
}
|
||||
|
||||
switch(opcode)
|
||||
diff --git a/src/pcre2_jit_test.c b/src/pcre2_jit_test.c
|
||||
index bb141a0..81c9582 100644
|
||||
--- a/src/pcre2_jit_test.c
|
||||
+++ b/src/pcre2_jit_test.c
|
||||
@@ -354,6 +354,7 @@ static struct regression_test_case regression_test_cases[] = {
|
||||
{ MU, A, 0, 0, "_[ab]+_*a", "_aa" },
|
||||
{ MU, A, 0, 0, "#(A+)#\\d+", "#A#A#0" },
|
||||
{ MU, A, 0, 0, "(?P<size>\\d+)m|M", "4M" },
|
||||
+ { M, PCRE2_NEWLINE_CRLF, 0, 0, "\\n?.+#", "\n,\n,#" },
|
||||
|
||||
/* Bracket repeats with limit. */
|
||||
{ MU, A, 0, 0, "(?:(ab){2}){5}M", "abababababababababababM" },
|
||||
--
|
||||
2.41.0
|
||||
|
||||
Binary file not shown.
@ -0,0 +1,65 @@
|
||||
From 457c0e69a8f78d32bc7d4b6422cd01e396a4cf5d Mon Sep 17 00:00:00 2001
|
||||
From: Philip Hazel <Philip.Hazel@gmail.com>
|
||||
Date: Tue, 3 Oct 2023 16:52:56 +0100
|
||||
Subject: [PATCH] Add more examples fixed by #300; update ChangeLog
|
||||
|
||||
---
|
||||
testdata/testinput1 | 8 ++++++++
|
||||
testdata/testoutput1 | 22 ++++++++++++++++++++++
|
||||
3 files changed, 34 insertions(+)
|
||||
|
||||
diff --git a/testdata/testinput1 b/testdata/testinput1
|
||||
index 3d75a35..533389d 100644
|
||||
--- a/testdata/testinput1
|
||||
+++ b/testdata/testinput1
|
||||
@@ -4374,6 +4374,14 @@
|
||||
|
||||
/(?<all>(?:(?:a(?&all))|(b))(c?))/
|
||||
aabc
|
||||
+
|
||||
+/(a(b)|(c))(?1)/
|
||||
+ abc
|
||||
+ cab
|
||||
+
|
||||
+/(?1)(a(b)|(c))/
|
||||
+ abc
|
||||
+ cab
|
||||
|
||||
/(?<NAME>(?&NAME_PAT))\s+(?<ADDR>(?&ADDRESS_PAT))
|
||||
(?(DEFINE)
|
||||
diff --git a/testdata/testoutput1 b/testdata/testoutput1
|
||||
index 26d3c83..bedd924 100644
|
||||
--- a/testdata/testoutput1
|
||||
+++ b/testdata/testoutput1
|
||||
@@ -6954,6 +6954,28 @@ No match
|
||||
1: aabc
|
||||
2: <unset>
|
||||
3:
|
||||
+
|
||||
+/(a(b)|(c))(?1)/
|
||||
+ abc
|
||||
+ 0: abc
|
||||
+ 1: ab
|
||||
+ 2: b
|
||||
+ cab
|
||||
+ 0: cab
|
||||
+ 1: c
|
||||
+ 2: <unset>
|
||||
+ 3: c
|
||||
+
|
||||
+/(?1)(a(b)|(c))/
|
||||
+ abc
|
||||
+ 0: abc
|
||||
+ 1: c
|
||||
+ 2: <unset>
|
||||
+ 3: c
|
||||
+ cab
|
||||
+ 0: cab
|
||||
+ 1: ab
|
||||
+ 2: b
|
||||
|
||||
/(?<NAME>(?&NAME_PAT))\s+(?<ADDR>(?&ADDRESS_PAT))
|
||||
(?(DEFINE)
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -0,0 +1,61 @@
|
||||
From 794245ecc296724b52f5030831e58bedbffa2452 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas@gmail.com>
|
||||
Date: Tue, 3 Oct 2023 08:14:23 -0700
|
||||
Subject: [PATCH] match: also restore originally unset entries in recursion
|
||||
(#300)
|
||||
|
||||
A regresion from ~10.30 not affecting JIT
|
||||
---
|
||||
src/pcre2_match.c | 2 +-
|
||||
testdata/testinput1 | 3 +++
|
||||
testdata/testoutput1 | 7 +++++++
|
||||
3 files changed, 11 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/pcre2_match.c b/src/pcre2_match.c
|
||||
index 5ce1792..8b57c75 100644
|
||||
--- a/src/pcre2_match.c
|
||||
+++ b/src/pcre2_match.c
|
||||
@@ -5953,7 +5953,7 @@ fprintf(stderr, "++ op=%d\n", *Fecode);
|
||||
{
|
||||
P = (heapframe *)((char *)N - frame_size);
|
||||
memcpy((char *)F + offsetof(heapframe, ovector), P->ovector,
|
||||
- P->offset_top * sizeof(PCRE2_SIZE));
|
||||
+ Foffset_top * sizeof(PCRE2_SIZE));
|
||||
Foffset_top = P->offset_top;
|
||||
Fcapture_last = P->capture_last;
|
||||
Fcurrent_recurse = P->current_recurse;
|
||||
diff --git a/testdata/testinput1 b/testdata/testinput1
|
||||
index 062dfe0..3d75a35 100644
|
||||
--- a/testdata/testinput1
|
||||
+++ b/testdata/testinput1
|
||||
@@ -4372,6 +4372,9 @@
|
||||
/^(?(DEFINE) (?<A> a) (?<B> b) ) (?&A) (?&B) /x
|
||||
abcd
|
||||
|
||||
+/(?<all>(?:(?:a(?&all))|(b))(c?))/
|
||||
+ aabc
|
||||
+
|
||||
/(?<NAME>(?&NAME_PAT))\s+(?<ADDR>(?&ADDRESS_PAT))
|
||||
(?(DEFINE)
|
||||
(?<NAME_PAT>[a-z]+)
|
||||
diff --git a/testdata/testoutput1 b/testdata/testoutput1
|
||||
index 1dc3b2f..26d3c83 100644
|
||||
--- a/testdata/testoutput1
|
||||
+++ b/testdata/testoutput1
|
||||
@@ -6948,6 +6948,13 @@ No match
|
||||
abcd
|
||||
0: ab
|
||||
|
||||
+/(?<all>(?:(?:a(?&all))|(b))(c?))/
|
||||
+ aabc
|
||||
+ 0: aabc
|
||||
+ 1: aabc
|
||||
+ 2: <unset>
|
||||
+ 3:
|
||||
+
|
||||
/(?<NAME>(?&NAME_PAT))\s+(?<ADDR>(?&ADDRESS_PAT))
|
||||
(?(DEFINE)
|
||||
(?<NAME_PAT>[a-z]+)
|
||||
--
|
||||
2.41.0
|
||||
|
||||
@ -0,0 +1,33 @@
|
||||
From f2411acb3711a44497539d17b245bd366d9c26d7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= <carenas@gmail.com>
|
||||
Date: Mon, 12 Dec 2022 08:32:42 -0800
|
||||
Subject: [PATCH] jit: fail early in ffcps_* if subject shorter than offs1
|
||||
(#175)
|
||||
|
||||
FF_FUN would try loading a vector from an invalid address
|
||||
triggering a crash.
|
||||
|
||||
Add the same check that is done in the x86/s390x implementations
|
||||
and that was missing from the original code.
|
||||
|
||||
Fixes: #86
|
||||
---
|
||||
src/pcre2_jit_neon_inc.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/pcre2_jit_neon_inc.h b/src/pcre2_jit_neon_inc.h
|
||||
index e74adf12..165602ed 100644
|
||||
--- a/src/pcre2_jit_neon_inc.h
|
||||
+++ b/src/pcre2_jit_neon_inc.h
|
||||
@@ -183,6 +183,8 @@ restart:;
|
||||
#endif
|
||||
|
||||
#if defined(FFCPS)
|
||||
+if (str_ptr >= str_end)
|
||||
+ return NULL;
|
||||
sljit_u8 *p1 = str_ptr - diff;
|
||||
#endif
|
||||
sljit_s32 align_offset = ((uint64_t)str_ptr & 0xf);
|
||||
--
|
||||
2.45.1
|
||||
|
||||
Loading…
Reference in new issue