Fix pcre2_jit_match() to properly check the pattern for JIT-compiled

pcre2-10.30-Fix-pcre2_jit_match-early-check.patch

@@ -0,0 +1,28 @@
+From 67aa24cc00470222301cb5fe3c53bc319105d092 Mon Sep 17 00:00:00 2001
+From: zherczeg <zherczeg@6239d852-aaf2-0410-a92c-79f79f948069>
+Date: Thu, 23 Nov 2017 07:54:39 +0000
+Subject: [PATCH] Fix pcre2_jit_match early check.
+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@884 6239d852-aaf2-0410-a92c-79f79f948069
+
+Petr Písař: Ported to 10.30.
+
+diff --git a/src/pcre2_jit_match.c b/src/pcre2_jit_match.c
+index 4cad754..2f840ab 100644
+--- a/src/pcre2_jit_match.c
++++ b/src/pcre2_jit_match.c
+@@ -118,7 +118,7 @@ if ((options & PCRE2_PARTIAL_HARD) != 0)
+ else if ((options & PCRE2_PARTIAL_SOFT) != 0)
+   index = 1;
+ 
+-if (functions->executable_funcs[index] == NULL)
++if (functions->executable_funcs == NULL || functions->executable_funcs[index] == NULL)
+   return PCRE2_ERROR_JIT_BADOPTION;
+ 
+ /* Sanity checks should be handled by pcre_exec. */
+-- 
+2.13.6
+

pcre2.spec

@@ -6,7 +6,7 @@
 #%%global rcversion RC1
 Name:       pcre2
 Version:    10.30
-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,9 @@ Patch3:     pcre2-10.30-Remove-superflous-variable.patch
 # Fix multi-line matching in pcre2grep tool, upstream bug #2187,
 # in upstream after 10.30
 Patch4:     pcre2-10.30-Fix-multiple-multiline-matching-issues-in-pcre2grep.patch
+# Fix pcre2_jit_match() to properly check the pattern was JIT-compiled,
+# in upstream after 10.30
+Patch5:     pcre2-10.30-Fix-pcre2_jit_match-early-check.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  coreutils
@@ -131,6 +134,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 # Because of multilib patch
 libtoolize --copy --force
 autoreconf -vif
@@ -234,6 +238,9 @@ make %{?_smp_mflags} check VERBOSE=yes
 %{_mandir}/man1/pcre2test.*
 
 %changelog
+* Fri Dec 22 2017 Petr Pisar <ppisar@redhat.com> - 10.30-4
+- Fix pcre2_jit_match() to properly check the pattern was JIT-compiled
+
 * Mon Nov 13 2017 Petr Pisar <ppisar@redhat.com> - 10.30-3
 - Fix multi-line matching in pcre2grep tool (upstream bug #2187)