From 135d269f6f2b255ef0010057825fe863742ccd5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Mon, 9 Jul 2018 11:15:49 +0200
Subject: [PATCH] Fix parsing VERSION conditions

---
 ...31-Fix-bug-in-VERSION-number-reading.patch | 73 +++++++++++++++++++
 pcre2.spec                                    |  4 +
 2 files changed, 77 insertions(+)
 create mode 100644 pcre2-10.31-Fix-bug-in-VERSION-number-reading.patch

diff --git a/pcre2-10.31-Fix-bug-in-VERSION-number-reading.patch b/pcre2-10.31-Fix-bug-in-VERSION-number-reading.patch
new file mode 100644
index 0000000..c73030a
--- /dev/null
+++ b/pcre2-10.31-Fix-bug-in-VERSION-number-reading.patch
@@ -0,0 +1,73 @@
+From c75868f77eb2ce2ff277355afcd966e3179e65a8 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>
+Date: Mon, 2 Jul 2018 12:26:04 +0000
+Subject: [PATCH] Fix bug in VERSION number reading.
+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@957 6239d852-aaf2-0410-a92c-79f79f948069
+Petr Písař: Ported to 10.31.
+---
+ src/pcre2_compile.c  | 5 ++---
+ testdata/testinput2  | 3 +++
+ testdata/testoutput2 | 6 +++++-
+ 4 files changed, 13 insertions(+), 4 deletions(-)
+
+diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
+index 5a47f1d..1208012 100644
+--- a/src/pcre2_compile.c
++++ b/src/pcre2_compile.c
+@@ -3896,9 +3896,8 @@ while (ptr < ptrend)
+         if (*ptr == CHAR_DOT)
+           {
+           if (++ptr >= ptrend || !IS_DIGIT(*ptr)) goto BAD_VERSION_CONDITION;
+-          if (!read_number(&ptr, ptrend, -1, 99 , ERR79, &minor, &errorcode))
+-            goto FAILED;
+-          if (minor < 10) minor *= 10;
++          minor = (*ptr++ - CHAR_0) * 10;
++          if (IS_DIGIT(*ptr)) minor += *ptr++ - CHAR_0; 
+           if (ptr >= ptrend || *ptr != CHAR_RIGHT_PARENTHESIS)
+             goto BAD_VERSION_CONDITION;
+           }
+diff --git a/testdata/testinput2 b/testdata/testinput2
+index cc4b59b..9b207ef 100644
+--- a/testdata/testinput2
++++ b/testdata/testinput2
+@@ -4007,6 +4007,9 @@
+ /(?(VERSION>=10.0)yes|no)/I
+     yesno
+ 
++/(?(VERSION>=10.04)yes|no)/
++    yesno
++
+ /(?(VERSION=8)yes){3}/BI,aftertext
+     yesno
+ 
+diff --git a/testdata/testoutput2 b/testdata/testoutput2
+index aab0c94..124a8b6 100644
+--- a/testdata/testoutput2
++++ b/testdata/testoutput2
+@@ -13483,6 +13483,10 @@ Subject length lower bound = 2
+     yesno
+  0: yes
+ 
++/(?(VERSION>=10.04)yes|no)/
++    yesno
++ 0: yes
++
+ /(?(VERSION=8)yes){3}/BI,aftertext
+ ------------------------------------------------------------------
+         Bra
+@@ -13537,7 +13541,7 @@ Failed: error 179 at offset 11: syntax error or number too big in (?(VERSION con
+ Failed: error 179 at offset 16: syntax error or number too big in (?(VERSION condition
+ 
+ /(?(VERSION=10.101)yes|no)/
+-Failed: error 179 at offset 17: syntax error or number too big in (?(VERSION condition
++Failed: error 179 at offset 16: syntax error or number too big in (?(VERSION condition
+ 
+ /abcd/I
+ Capturing subpattern count = 0
+-- 
+2.14.4
+
diff --git a/pcre2.spec b/pcre2.spec
index bbdec86..6f92c47 100644
--- a/pcre2.spec
+++ b/pcre2.spec
@@ -79,6 +79,8 @@ Patch9:     pcre2-10.31-Fix-global-search-replace-in-pcre2test-and-pcre2_sub.pat
 # lookbehind assertion is used inside a lookahead assertion,
 # in upstream after 10.31
 Patch10:    pcre2-10.31-Ignore-qualifiers-on-lookaheads-within-lookbehinds-w.patch
+# Fix parsing VERSION conditions, in upstream after pcre-10.31
+Patch11:    pcre2-10.31-Fix-bug-in-VERSION-number-reading.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  coreutils
@@ -165,6 +167,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 # Because of multilib patch
 libtoolize --copy --force
 autoreconf -vif
@@ -270,6 +273,7 @@ make %{?_smp_mflags} check VERBOSE=yes
 * Mon Jul 09 2018 Petr Pisar <ppisar@redhat.com> - 10.31-7
 - Fix checking that a lookbehind assertion has a fixed length if the
   lookbehind assertion is used inside a lookahead assertion
+- Fix parsing VERSION conditions
 
 * Mon Jul 02 2018 Petr Pisar <ppisar@redhat.com> - 10.31-6
 - Fix global search/replace in pcre2test and pcre2_substitute() when the pattern