From d256ba9daf20db644e39e3473637da3e513e7b43 Mon Sep 17 00:00:00 2001
From: Lukas Javorsky <ljavorsk@redhat.com>
Date: Tue, 17 Oct 2023 15:28:39 +0000
Subject: [PATCH] Fix issue in the backtracking optimization of character in
 JIT

Resolves: RHEL-9938
---
 pcre2-10.40-Fix-JIT-regression-in-PHP.patch | 60 +++++++++++++++++++++
 pcre2.spec                                  |  7 ++-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 pcre2-10.40-Fix-JIT-regression-in-PHP.patch

diff --git a/pcre2-10.40-Fix-JIT-regression-in-PHP.patch b/pcre2-10.40-Fix-JIT-regression-in-PHP.patch
new file mode 100644
index 0000000..3b84856
--- /dev/null
+++ b/pcre2-10.40-Fix-JIT-regression-in-PHP.patch
@@ -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
+
diff --git a/pcre2.spec b/pcre2.spec
index 7a669d0..09287b6 100644
--- a/pcre2.spec
+++ b/pcre2.spec
@@ -9,7 +9,7 @@
 #%%global rcversion RC1
 Name:       pcre2
 Version:    10.40
-Release:    %{?rcversion:0.}2%{?rcversion:.%rcversion}%{?dist}
+Release:    %{?rcversion:0.}3%{?rcversion:.%rcversion}%{?dist}
 %global     myversion %{version}%{?rcversion:-%rcversion}
 Summary:    Perl-compatible regular expression library
 # the library:                          BSD with exceptions
@@ -51,6 +51,8 @@ Source1:    https://ftp.pcre.org/pub/pcre/%{?rcversion:Testing/}%{name}-%{myvers
 Source2:    https://ftp.pcre.org/pub/pcre/Public-Key
 # Do no set RPATH if libdir is not /usr/lib
 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
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -258,6 +260,9 @@ make %{?_smp_mflags} check VERBOSE=yes
 %{_mandir}/man1/pcre2test.*
 
 %changelog
+* Tue Oct 17 2023 Lukas Javorsky <ljavorsk@redhat.com> - 10.40-3
+- Fix issue in the backtracking optimization of character in JIT
+
 * Wed May 18 2022 Lukas Javorsky <ljavorsk@redhat.com> - 10.40-2
 - Explicitly require uft subpackages in tools subpackage