From 65814182f5cbb4633955cf93a6bcddec4c94421a Mon Sep 17 00:00:00 2001 From: Lukas Javorsky Date: Mon, 13 Nov 2023 14:00:36 +0000 Subject: [PATCH] Fix an issue with restoring originally unset entries in recursion Upstream commits: https://github.com/PCRE2Project/pcre2/commit/794245ecc296724b52f5030831e58bedbffa2452 https://github.com/PCRE2Project/pcre2/commit/457c0e69a8f78d32bc7d4b6422cd01e396a4cf5d Resolves: RHEL-16352 --- ...10.42-Add-more-examples-fixed-by-300.patch | 65 +++++++++++++++++++ ...re-originally-unset-entries-in-recur.patch | 61 +++++++++++++++++ pcre2.spec | 11 +++- 3 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 pcre2-10.42-Add-more-examples-fixed-by-300.patch create mode 100644 pcre2-10.42-Match-also-restore-originally-unset-entries-in-recur.patch diff --git a/pcre2-10.42-Add-more-examples-fixed-by-300.patch b/pcre2-10.42-Add-more-examples-fixed-by-300.patch new file mode 100644 index 0000000..a09a98b --- /dev/null +++ b/pcre2-10.42-Add-more-examples-fixed-by-300.patch @@ -0,0 +1,65 @@ +From 457c0e69a8f78d32bc7d4b6422cd01e396a4cf5d Mon Sep 17 00:00:00 2001 +From: Philip Hazel +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 @@ + + /(?(?:(?:a(?&all))|(b))(c?))/ + aabc ++ ++/(a(b)|(c))(?1)/ ++ abc ++ cab ++ ++/(?1)(a(b)|(c))/ ++ abc ++ cab + + /(?(?&NAME_PAT))\s+(?(?&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: + 3: ++ ++/(a(b)|(c))(?1)/ ++ abc ++ 0: abc ++ 1: ab ++ 2: b ++ cab ++ 0: cab ++ 1: c ++ 2: ++ 3: c ++ ++/(?1)(a(b)|(c))/ ++ abc ++ 0: abc ++ 1: c ++ 2: ++ 3: c ++ cab ++ 0: cab ++ 1: ab ++ 2: b + + /(?(?&NAME_PAT))\s+(?(?&ADDRESS_PAT)) + (?(DEFINE) +-- +2.41.0 + diff --git a/pcre2-10.42-Match-also-restore-originally-unset-entries-in-recur.patch b/pcre2-10.42-Match-also-restore-originally-unset-entries-in-recur.patch new file mode 100644 index 0000000..6e46092 --- /dev/null +++ b/pcre2-10.42-Match-also-restore-originally-unset-entries-in-recur.patch @@ -0,0 +1,61 @@ +From 794245ecc296724b52f5030831e58bedbffa2452 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Carlo=20Marcelo=20Arenas=20Bel=C3=B3n?= +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) (? b) ) (?&A) (?&B) /x + abcd + ++/(?(?:(?:a(?&all))|(b))(c?))/ ++ aabc ++ + /(?(?&NAME_PAT))\s+(?(?&ADDRESS_PAT)) + (?(DEFINE) + (?[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 + ++/(?(?:(?:a(?&all))|(b))(c?))/ ++ aabc ++ 0: aabc ++ 1: aabc ++ 2: ++ 3: ++ + /(?(?&NAME_PAT))\s+(?(?&ADDRESS_PAT)) + (?(DEFINE) + (?[a-z]+) +-- +2.41.0 + diff --git a/pcre2.spec b/pcre2.spec index 09287b6..b89dc5b 100644 --- a/pcre2.spec +++ b/pcre2.spec @@ -9,7 +9,7 @@ #%%global rcversion RC1 Name: pcre2 Version: 10.40 -Release: %{?rcversion:0.}3%{?rcversion:.%rcversion}%{?dist} +Release: %{?rcversion:0.}4%{?rcversion:.%rcversion}%{?dist} %global myversion %{version}%{?rcversion:-%rcversion} Summary: Perl-compatible regular expression library # the library: BSD with exceptions @@ -53,6 +53,11 @@ Source2: https://ftp.pcre.org/pub/pcre/Public-Key Patch0: pcre2-10.10-Fix-multilib.patch # Upstream patch: https://github.com/PCRE2Project/pcre2/commit/4851890ede31313655e19180f4959ed348fee580 Patch1: pcre2-10.40-Fix-JIT-regression-in-PHP.patch +# Upstream commits: +# https://github.com/PCRE2Project/pcre2/commit/794245ecc296724b52f5030831e58bedbffa2452 +# https://github.com/PCRE2Project/pcre2/commit/457c0e69a8f78d32bc7d4b6422cd01e396a4cf5d +Patch2: pcre2-10.42-Match-also-restore-originally-unset-entries-in-recur.patch +Patch3: pcre2-10.42-Add-more-examples-fixed-by-300.patch BuildRequires: autoconf BuildRequires: automake @@ -260,6 +265,10 @@ make %{?_smp_mflags} check VERBOSE=yes %{_mandir}/man1/pcre2test.* %changelog +* Mon Nov 13 2023 Lukas Javorsky - 10.40-4 +- Fix an issue with restoring originally unset entries in recursion +- Resolves: BZ#2248133 + * Tue Oct 17 2023 Lukas Javorsky - 10.40-3 - Fix issue in the backtracking optimization of character in JIT