pool/pcre
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 976389 from home:jsikes:branches:Base:System

Browse Source 
finally fixed bsc 1199232. Enjoy!

OBS-URL: https://build.opensuse.org/request/show/976389
OBS-URL: https://build.opensuse.org/package/show/Base:System/pcre?expand=0&rev=103
This commit is contained in:
Andreas Jaeger 2022-05-16 06:37:09 +00:00 committed by Git OBS Bridge
parent 4a6d76330f
commit e03093eea2
3 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pcre-8.45-bsc1199232-unicode-property-matching.patch Normal file
View File

@ -0,0 +1,42 @@
diff --git a/ChangeLog b/ChangeLog
index 86acd7b..9afbb0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -145,6 +145,12 @@ crash. This issue was fixed for other kinds of repeat in release 8.37 by change
13. Fix misleading error message in configure.ac.
+23. Fixed a unicode properrty matching issue in JIT. The character was not
+fully read in caseless matching.
+
+23. Fixed a unicode properrty matching issue in JIT. The character was not
+fully read in caseless matching.
+
Version 8.41 05-July-2017
-------------------------
diff --git a/pcre_jit_compile.c b/pcre_jit_compile.c
index 4dcf8fc..5ab5206 100644
--- a/pcre_jit_compile.c
+++ b/pcre_jit_compile.c
@@ -5679,7 +5679,7 @@ while (*cc != XCL_END)
{
SLJIT_ASSERT(*cc == XCL_PROP || *cc == XCL_NOTPROP);
cc++;
- if (*cc == PT_CLIST)
+ if (*cc == PT_CLIST && cc[-1] == XCL_PROP)
{
other_cases = PRIV(ucd_caseless_sets) + cc[1];
while (*other_cases != NOTACHAR)
diff --git a/pcre_jit_test.c b/pcre_jit_test.c
index 034cb52..cd687c3 100644
--- a/pcre_jit_test.c
+++ b/pcre_jit_test.c
@@ -387,6 +387,7 @@ static struct regression_test_case regression_test_cases[] = {
{ MUAP, 0 | F_PROPERTY, "[\xc3\xa2-\xc3\xa6\xc3\x81-\xc3\x84\xe2\x80\xa8-\xe2\x80\xa9\xe6\x92\xad\\p{Zs}]{2,}", "\xe2\x80\xa7\xe2\x80\xa9\xe6\x92\xad \xe6\x92\xae" },
{ MUAP, 0 | F_PROPERTY, "[\\P{L&}]{2}[^\xc2\x85-\xc2\x89\\p{Ll}\\p{Lu}]{2}", "\xc3\xa9\xe6\x92\xad.a\xe6\x92\xad|\xc2\x8a#" },
{ PCRE_UCP, 0, "[a-b\\s]{2,5}[^a]", "AB baaa" },
+ { CMUAP, 0, "[^S]\\B", "\xe2\x80\x8a" },
/* Possible empty brackets. */
{ MUA, 0, "(?:|ab||bc|a)+d", "abcxabcabd" },

7
pcre.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed May 11 09:21:09 UTC 2022 - Jason Sikes <jsikes@suse.com>
- Added pcre-8.45-bsc1199232-unicode-property-matching.patch
* bsc#1199232
* Fixes unicode property matching issue
-------------------------------------------------------------------
Mon Jul 26 21:30:10 UTC 2021 - Dirk Müller <dmueller@suse.com>

4
pcre.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package pcre
#
# Copyright (c) 2021 SUSE LLC
# Copyright (c) 2022 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -36,6 +36,7 @@ Patch1: pcre-8.21-multilib.patch
Patch2: pcre-8.41-stack_frame_size_detection.patch
#Patch 3: see: https://sources.debian.net/patches/pcre3/2:8.39-2/pcreposix.patch/ and cyrus imapd issue #1731
Patch3: pcre-8.42-pcreposix.patch
Patch4: pcre-8.45-bsc1199232-unicode-property-matching.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@ -154,6 +155,7 @@ as Perl 5.
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%build
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects