From 03881ebe327079bce546acb533ce84cd27e77dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Fri, 16 Mar 2018 12:42:26 +0100
Subject: [PATCH] Fix setting error offset zero for early errors in
 pcre2_pattern_convert()

---
 ...-zero-for-early-errors-in-pcre2_patt.patch | 65 +++++++++++++++++++
 pcre2.spec                                    |  9 ++-
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 pcre2-10.31-Set-error-offset-zero-for-early-errors-in-pcre2_patt.patch

diff --git a/pcre2-10.31-Set-error-offset-zero-for-early-errors-in-pcre2_patt.patch b/pcre2-10.31-Set-error-offset-zero-for-early-errors-in-pcre2_patt.patch
new file mode 100644
index 0000000..48394dc
--- /dev/null
+++ b/pcre2-10.31-Set-error-offset-zero-for-early-errors-in-pcre2_patt.patch
@@ -0,0 +1,65 @@
+From c82ef7bef66138a85362473df622d16bf728499e Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>
+Date: Sun, 4 Mar 2018 15:13:37 +0000
+Subject: [PATCH] Set error offset zero for early errors in
+ pcre2_pattern_convert().
+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@926 6239d852-aaf2-0410-a92c-79f79f948069
+Petr Písař: Ported to 10.31.
+---
+ src/pcre2_convert.c | 12 +++++++++---
+
+diff --git a/src/pcre2_convert.c b/src/pcre2_convert.c
+index bdf9b86..1dd5c33 100644
+--- a/src/pcre2_convert.c
++++ b/src/pcre2_convert.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-2017 University of Cambridge
++          New API code Copyright (c) 2016-2018 University of Cambridge
+ 
+ -----------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+@@ -1066,11 +1066,12 @@ BOOL utf = (options & PCRE2_CONVERT_UTF) != 0;
+ uint32_t pattype = options & TYPE_OPTIONS;
+ 
+ if (pattern == NULL || bufflenptr == NULL) return PCRE2_ERROR_NULL;
++
+ if ((options & ~ALL_OPTIONS) != 0 ||        /* Undefined bit set */
+     (pattype & (~pattype+1)) != pattype ||  /* More than one type set */
+     pattype == 0)                           /* No type set */
+   {
+-  *bufflenptr = 0;  /* Error offset */
++  *bufflenptr = 0;                          /* Error offset */
+   return PCRE2_ERROR_BADOPTION;
+   }
+ 
+@@ -1081,7 +1082,11 @@ if (ccontext == NULL) ccontext =
+ /* Check UTF if required. */
+ 
+ #ifndef SUPPORT_UNICODE
+-if (utf) return PCRE2_ERROR_UNICODE_NOT_SUPPORTED;
++if (utf)
++  {
++  *bufflenptr = 0;  /* Error offset */
++  return PCRE2_ERROR_UNICODE_NOT_SUPPORTED;
++  }
+ #else
+ if (utf && (options & PCRE2_CONVERT_NO_UTF_CHECK) == 0)
+   {
+@@ -1126,6 +1131,7 @@ for (i = 0; i < 2; i++)
+     break;
+ 
+     default:
++    *bufflenptr = 0;  /* Error offset */
+     return PCRE2_ERROR_INTERNAL;
+     }
+ 
+-- 
+2.14.3
+
diff --git a/pcre2.spec b/pcre2.spec
index 0d7773b..de57bda 100644
--- a/pcre2.spec
+++ b/pcre2.spec
@@ -9,7 +9,7 @@
 #%%global rcversion RC1
 Name:       pcre2
 Version:    10.31
-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
@@ -65,6 +65,9 @@ Patch4:     pcre2-10.31-Fix-C-bug-with-repeated-character-classes-in-UTF-8-m.pat
 Patch5:     pcre2-10.31-Add-support-to-pcre2grep-for-binary-zeros-in-f-files.patch
 # Fix compiler warnings in pcre2grep, in upstream after 10.31
 Patch6:     pcre2-10.31-A-small-fix-to-pcre2grep-to-avoid-compiler-warnings-.patch
+# Fix setting error offset zero for early errors in pcre2_pattern_convert(),
+# in upstream after 10.31
+Patch7:     pcre2-10.31-Set-error-offset-zero-for-early-errors-in-pcre2_patt.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  coreutils
@@ -147,6 +150,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 # Because of multilib patch
 libtoolize --copy --force
 autoreconf -vif
@@ -249,6 +253,9 @@ make %{?_smp_mflags} check VERBOSE=yes
 %{_mandir}/man1/pcre2test.*
 
 %changelog
+* Fri Mar 16 2018 Petr Pisar <ppisar@redhat.com> - 10.31-4
+- Fix setting error offset zero for early errors in pcre2_pattern_convert()
+
 * Mon Feb 26 2018 Petr Pisar <ppisar@redhat.com> - 10.31-3
 - Add support to pcre2grep for binary zeros in -f files (upstream bug #2222)
 - Fix compiler warnings in pcre2grep