From 3841a80996b30315020e1fe5ce6f670f8e9bd9a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 16 Sep 2020 10:16:36 +0200
Subject: [PATCH] Fix a mismatch when caselessly searching in an invalid UTF-8
 text and a start optimization is enabled

---
 ...2-no-match-bug-in-8-bit-mode-for-cas.patch | 79 +++++++++++++++++++
 pcre2.spec                                    |  6 ++
 2 files changed, 85 insertions(+)
 create mode 100644 pcre2-10.35-Fix-Bugzilla-2642-no-match-bug-in-8-bit-mode-for-cas.patch

diff --git a/pcre2-10.35-Fix-Bugzilla-2642-no-match-bug-in-8-bit-mode-for-cas.patch b/pcre2-10.35-Fix-Bugzilla-2642-no-match-bug-in-8-bit-mode-for-cas.patch
new file mode 100644
index 0000000..abe04a1
--- /dev/null
+++ b/pcre2-10.35-Fix-Bugzilla-2642-no-match-bug-in-8-bit-mode-for-cas.patch
@@ -0,0 +1,79 @@
+From c23be766617cbfcb14e56dc5f1f01289077bd125 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>
+Date: Tue, 15 Sep 2020 14:36:23 +0000
+Subject: [PATCH] Fix Bugzilla #2642: no match bug in 8-bit mode for caseless
+ invalid utf matching.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+git-svn-id: svn://vcs.exim.org/pcre2/code/trunk@1272 6239d852-aaf2-0410-a92c-79f79f948069
+Petr Písař: Ported to 10.35.
+---
+ src/pcre2_match.c     | 10 ++++++++--
+ testdata/testinput10  |  3 +++
+ testdata/testoutput10 |  4 ++++
+
+diff --git a/src/pcre2_match.c b/src/pcre2_match.c
+index 11289d5..3372410 100644
+--- a/src/pcre2_match.c
++++ b/src/pcre2_match.c
+@@ -6115,8 +6115,8 @@ BOOL has_req_cu = FALSE;
+ BOOL startline;
+ 
+ #if PCRE2_CODE_UNIT_WIDTH == 8
+-BOOL memchr_not_found_first_cu = FALSE;
+-BOOL memchr_not_found_first_cu2 = FALSE;
++BOOL memchr_not_found_first_cu;
++BOOL memchr_not_found_first_cu2;
+ #endif
+ 
+ PCRE2_UCHAR first_cu = 0;
+@@ -6709,6 +6709,11 @@ FRAGMENT_RESTART:
+ start_partial = match_partial = NULL;
+ mb->hitend = FALSE;
+ 
++#if PCRE2_CODE_UNIT_WIDTH == 8
++memchr_not_found_first_cu = FALSE;
++memchr_not_found_first_cu2 = FALSE;
++#endif
++
+ for(;;)
+   {
+   PCRE2_SPTR new_start_match;
+@@ -7187,6 +7192,7 @@ if (utf && end_subject != true_end_subject &&
+     starting code units in 8-bit and 16-bit modes. */
+ 
+     start_match = end_subject + 1;
++    
+ #if PCRE2_CODE_UNIT_WIDTH != 32
+     while (start_match < true_end_subject && NOT_FIRSTCU(*start_match))
+       start_match++;
+diff --git a/testdata/testinput10 b/testdata/testinput10
+index b3c3197..efd3298 100644
+--- a/testdata/testinput10
++++ b/testdata/testinput10
+@@ -610,4 +610,7 @@
+ /X(\x{e1})Y/replace=>\U$1<,substitute_extended
+     X\x{e1}Y
+ 
++/A/utf,match_invalid_utf,caseless
++    \xe5A
++
+ # End of testinput10
+diff --git a/testdata/testoutput10 b/testdata/testoutput10
+index 59af535..2a3803f 100644
+--- a/testdata/testoutput10
++++ b/testdata/testoutput10
+@@ -1871,4 +1871,8 @@ Subject length lower bound = 1
+     X\x{e1}Y
+  1: >\xe1<
+ 
++/A/utf,match_invalid_utf,caseless
++    \xe5A
++ 0: A
++
+ # End of testinput10
+-- 
+2.25.4
+
diff --git a/pcre2.spec b/pcre2.spec
index 2ee50ce..d21881e 100644
--- a/pcre2.spec
+++ b/pcre2.spec
@@ -72,6 +72,9 @@ Patch6:     pcre2-10.35-Fix-delimiters-in-tests-1-and-4-for-correct-Perl-beh.pat
 # Fix escaping test data and only allow slash delimiter after perltest pragma,
 # upstream bug #2641, in upstream after 10.35
 Patch7:     pcre2-10.35-Update-pcre2test-to-check-delimiters-after-perltest-.patch
+# Fix a mismatch when caselessly searching in an invalid UTF-8 text and a start
+# optimization is enabled, upstream bug #2642, in upstream after 10.35
+Patch8:     pcre2-10.35-Fix-Bugzilla-2642-no-match-bug-in-8-bit-mode-for-cas.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  coreutils
@@ -170,6 +173,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 # Because of multilib patch
 libtoolize --copy --force
 autoreconf -vif
@@ -286,6 +290,8 @@ make %{?_smp_mflags} check VERBOSE=yes
 * Wed Sep 16 2020 Petr Pisar <ppisar@redhat.com> - 10.35-6
 - Fix escaping test data and only allow slash delimiter after perltest pragma
   (upstream bug #2641)
+- Fix a mismatch when caselessly searching in an invalid UTF-8 text and a start
+  optimization is enabled (upstream bug #2642)
 
 * Mon Sep 14 2020 Petr Pisar <ppisar@redhat.com> - 10.35-5
 - Fix escaping test data (upstream bug #2641)