From 876d98e64a9c735e51d74b9a47bcdba40ea217a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 15 Jan 2021 09:16:26 +0100
Subject: [PATCH] Fix a possible NULL pointer dereference in auto_possessify()

---
 ...analyzer-error-though-it-was-probabl.patch | 59 +++++++++++++++++++
 pcre2.spec                                    | 12 +++-
 2 files changed, 68 insertions(+), 3 deletions(-)
 create mode 100644 pcre2-10.36-Get-rid-of-gcc-fanalyzer-error-though-it-was-probabl.patch

diff --git a/pcre2-10.36-Get-rid-of-gcc-fanalyzer-error-though-it-was-probabl.patch b/pcre2-10.36-Get-rid-of-gcc-fanalyzer-error-though-it-was-probabl.patch
new file mode 100644
index 0000000..b5b33c6
--- /dev/null
+++ b/pcre2-10.36-Get-rid-of-gcc-fanalyzer-error-though-it-was-probabl.patch
@@ -0,0 +1,59 @@
+From 32e83fc2d59413d13039cc31db1558d9c0e3b874 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>
+Date: Thu, 14 Jan 2021 16:56:44 +0000
+Subject: [PATCH] Get rid of gcc -fanalyzer error (though it was probably a
+ false positive).
+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@1293 6239d852-aaf2-0410-a92c-79f79f948069
+Signed-off-by: Petr Písař <ppisar@redhat.com>
+Petr Pisar: Ported to 10.36.
+---
+ src/pcre2_auto_possess.c | 13 +++++++++----
+
+diff --git a/src/pcre2_auto_possess.c b/src/pcre2_auto_possess.c
+index c64cf85..66064ed 100644
+--- a/src/pcre2_auto_possess.c
++++ b/src/pcre2_auto_possess.c
+@@ -7,7 +7,7 @@ and semantics are as close as possible to those of the Perl 5 language.
+ 
+                        Written by Philip Hazel
+      Original API code Copyright (c) 1997-2012 University of Cambridge
+-          New API code Copyright (c) 2016-2020 University of Cambridge
++          New API code Copyright (c) 2016-2021 University of Cambridge
+ 
+ -----------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+@@ -490,6 +490,7 @@ switch(c)
+   list[2] = (uint32_t)(end - code);
+   return end;
+   }
++
+ return NULL;    /* Opcode not accepted */
+ }
+ 
+@@ -1186,12 +1187,16 @@ for (;;)
+     c = *repeat_opcode;
+     if (c >= OP_CRSTAR && c <= OP_CRMINRANGE)
+       {
+-      /* end must not be NULL. */
++      /* The return from get_chr_property_list() will never be NULL when
++      *code (aka c) is one of the three class opcodes. However, gcc with 
++      -fanalyzer notes that a NULL return is possible, and grumbles. Hence we 
++      put in a check. */ 
++       
+       end = get_chr_property_list(code, utf, ucp, cb->fcc, list);
+-
+       list[1] = (c & 1) == 0;
+ 
+-      if (compare_opcodes(end, utf, ucp, cb, list, end, &rec_limit))
++      if (end != NULL &&
++          compare_opcodes(end, utf, ucp, cb, list, end, &rec_limit))
+         {
+         switch (c)
+           {
+-- 
+2.26.2
+
diff --git a/pcre2.spec b/pcre2.spec
index 730c58a..520e3e9 100644
--- a/pcre2.spec
+++ b/pcre2.spec
@@ -9,7 +9,7 @@
 #%%global rcversion RC1
 Name:       pcre2
 Version:    10.36
-Release:    %{?rcversion:0.}1%{?rcversion:.%rcversion}%{?dist}
+Release:    %{?rcversion:0.}2%{?rcversion:.%rcversion}%{?dist}
 %global     myversion %{version}%{?rcversion:-%rcversion}
 Summary:    Perl-compatible regular expression library
 # the library:                          BSD with exceptions
@@ -51,6 +51,9 @@ 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
+# Fix a possible NULL pointer dereference in auto_possessify(),
+# upstream bug #2686, in upstream after 10.36
+Patch1:     pcre2-10.36-Get-rid-of-gcc-fanalyzer-error-though-it-was-probabl.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  coreutils
@@ -140,8 +143,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test.
 
 %prep
 %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
-%setup -q -n %{name}-%{myversion}
-%patch0 -p1
+%autosetup -n %{name}-%{myversion} -p1
 # Because of multilib patch
 libtoolize --copy --force
 autoreconf -vif
@@ -255,6 +257,10 @@ make %{?_smp_mflags} check VERBOSE=yes
 %{_mandir}/man1/pcre2test.*
 
 %changelog
+* Fri Jan 15 2021 Petr Pisar <ppisar@redhat.com> - 10.36-2
+- Fix a possible NULL pointer dereference in auto_possessify()
+  (upstream bug #2686)
+
 * Tue Dec 15 2020 Petr Pisar <ppisar@redhat.com> - 10.36-1
 - 10.36 bump