Fix returning unset groups in POSIX interface if REG_STARTEND a non-zero starting offset

pcre2-10.31-Fix-the-value-passed-back-for-POSIX-unset-groups-whe.patch

@@ -0,0 +1,133 @@
+From 1890db00e66f40d659470a8a988d71daf59a29f9 Mon Sep 17 00:00:00 2001
+From: ph10 <ph10@6239d852-aaf2-0410-a92c-79f79f948069>
+Date: Mon, 19 Feb 2018 14:49:42 +0000
+Subject: [PATCH] Fix the value passed back for POSIX unset groups when
+ REG_STARTEND has a non-zero starting offset, and make pcre2test show relevant
+ POSIX unset groups.
+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@915 6239d852-aaf2-0410-a92c-79f79f948069
+
+Petr Písař: Ported to 10.31.
+---
+ src/pcre2posix.c      | 10 ++++++----
+ src/pcre2test.c       |  8 ++++++--
+ testdata/testinput18  |  4 ++++
+ testdata/testoutput18 | 15 +++++++++++++++
+
+diff --git a/src/pcre2posix.c b/src/pcre2posix.c
+index 026943e..5a2f7cd 100644
+--- a/src/pcre2posix.c
++++ b/src/pcre2posix.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 University of Cambridge
++          New API code Copyright (c) 2016-2018 University of Cambridge
+ 
+ -----------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+@@ -93,7 +93,7 @@ information; I know nothing about MSVC myself). For example, something like
+ 
+   void __cdecl function(....)
+ 
+-might be needed. In order so make this easy, all the exported functions have
++might be needed. In order to make this easy, all the exported functions have
+ PCRE2_CALL_CONVENTION just before their names. It is rarely needed; if not
+ set, we ensure here that it has no effect. */
+ 
+@@ -344,8 +344,10 @@ if (rc >= 0)
+   if ((size_t)rc > nmatch) rc = (int)nmatch;
+   for (i = 0; i < (size_t)rc; i++)
+     {
+-    pmatch[i].rm_so = ovector[i*2] + so;
+-    pmatch[i].rm_eo = ovector[i*2+1] + so;
++    pmatch[i].rm_so = (ovector[i*2] == PCRE2_UNSET)? -1 : 
++      (int)(ovector[i*2] + so);
++    pmatch[i].rm_eo = (ovector[i*2+1] == PCRE2_UNSET)? -1 : 
++      (int)(ovector[i*2+1] + so);
+     }
+   for (; i < nmatch; i++) pmatch[i].rm_so = pmatch[i].rm_eo = -1;
+   return 0;
+diff --git a/src/pcre2test.c b/src/pcre2test.c
+index 15bf404..7eca618 100644
+--- a/src/pcre2test.c
++++ b/src/pcre2test.c
+@@ -11,7 +11,7 @@ hacked-up (non-) design had also run out of steam.
+ 
+                        Written by Philip Hazel
+      Original code Copyright (c) 1997-2012 University of Cambridge
+-    Rewritten code Copyright (c) 2016-2017 University of Cambridge
++    Rewritten code Copyright (c) 2016-2018 University of Cambridge
+ 
+ -----------------------------------------------------------------------------
+ Redistribution and use in source and binary forms, with or without
+@@ -6761,13 +6761,17 @@ if ((pat_patctl.control & CTL_POSIX) != 0)
+     fprintf(outfile, "Matched without capture\n");
+   else
+     {
+-    size_t i;
++    size_t i, j;
++    size_t last_printed = (size_t)dat_datctl.oveccount;
+     for (i = 0; i < (size_t)dat_datctl.oveccount; i++)
+       {
+       if (pmatch[i].rm_so >= 0)
+         {
+         PCRE2_SIZE start = pmatch[i].rm_so;
+         PCRE2_SIZE end = pmatch[i].rm_eo;
++        for (j = last_printed + 1; j < i; j++)
++          fprintf(outfile, "%2d: <unset>\n", (int)j);
++        last_printed = i; 
+         if (start > end)
+           {
+           start = pmatch[i].rm_eo;
+diff --git a/testdata/testinput18 b/testdata/testinput18
+index 755a0c9..563a506 100644
+--- a/testdata/testinput18
++++ b/testdata/testinput18
+@@ -134,4 +134,8 @@
+ 
+ /a\b(c/literal,posix,dotall
+ 
++/((a)(b)?(c))/posix
++    123ace
++    123ace\=posix_startend=2:6
++
+ # End of testdata/testinput18
+diff --git a/testdata/testoutput18 b/testdata/testoutput18
+index d51423d..d6e3c71 100644
+--- a/testdata/testoutput18
++++ b/testdata/testoutput18
+@@ -46,6 +46,7 @@
+     defabc\=noteol
+  0: def
+  1: def
++ 2: <unset>
+  3: def
+ 
+ /the quick brown fox/
+@@ -206,4 +207,18 @@ No match: POSIX code 17: match failed
+ /a\b(c/literal,posix,dotall
+ Failed: POSIX code 16: bad argument at offset 0     
+ 
++/((a)(b)?(c))/posix
++    123ace
++ 0: ac
++ 1: ac
++ 2: a
++ 3: <unset>
++ 4: c
++    123ace\=posix_startend=2:6
++ 0: ac
++ 1: ac
++ 2: a
++ 3: <unset>
++ 4: c
++
+ # End of testdata/testinput18
+-- 
+2.13.6
+

pcre2.spec

@@ -9,7 +9,7 @@
 #%%global rcversion RC1
 Name:       pcre2
 Version:    10.31
-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
@@ -48,6 +48,9 @@ URL:        http://www.pcre.org/
 Source:     ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/%{?rcversion:Testing/}%{name}-%{myversion}.tar.bz2
 # Do no set RPATH if libdir is not /usr/lib
 Patch0:     pcre2-10.10-Fix-multilib.patch
+# Fix returning unset groups in POSIX interface if REG_STARTEND a non-zero
+# starting offset, upstream bug #2244, in upstream after 10.31
+Patch1:     pcre2-10.31-Fix-the-value-passed-back-for-POSIX-unset-groups-whe.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  coreutils
@@ -124,6 +127,7 @@ Utilities demonstrating PCRE2 capabilities like pcre2grep or pcre2test.
 %prep
 %setup -q -n %{name}-%{myversion}
 %patch0 -p1
+%patch1 -p1
 # Because of multilib patch
 libtoolize --copy --force
 autoreconf -vif
@@ -226,6 +230,10 @@ make %{?_smp_mflags} check VERBOSE=yes
 %{_mandir}/man1/pcre2test.*
 
 %changelog
+* Tue Feb 20 2018 Petr Pisar <ppisar@redhat.com> - 10.31-2
+- Fix returning unset groups in POSIX interface if REG_STARTEND a non-zero
+  starting offset (upstream bug #2244)
+
 * Mon Feb 12 2018 Petr Pisar <ppisar@redhat.com> - 10.31-1
 - 10.31 bump