From 6296d6b15c646b433b72dc6da7f1c1606aa68030 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Mon, 29 Feb 2016 14:03:19 +0100 Subject: [PATCH] Fix a typo in pcre_study --- pcre-8.38-Fix-typo-in-pcre_study.patch | 28 ++++++++++++++++++++++++++ pcre.spec | 4 ++++ 2 files changed, 32 insertions(+) create mode 100644 pcre-8.38-Fix-typo-in-pcre_study.patch diff --git a/pcre-8.38-Fix-typo-in-pcre_study.patch b/pcre-8.38-Fix-typo-in-pcre_study.patch new file mode 100644 index 0000000..194d9ad --- /dev/null +++ b/pcre-8.38-Fix-typo-in-pcre_study.patch @@ -0,0 +1,28 @@ +From f9cc3952c363234ecb472dbea82661ba733f8bd1 Mon Sep 17 00:00:00 2001 +From: ph10 +Date: Sun, 28 Feb 2016 14:56:33 +0000 +Subject: [PATCH] Fix typo in pcre_study(). +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1639 2f5784b3-3f2a-0410-8824-cb99058d5e15 + +Petr Písař: Ported to 8.38. + +diff --git a/pcre_study.c b/pcre_study.c +index 7fd0ba0..d9d4960 100644 +--- a/pcre_study.c ++++ b/pcre_study.c +@@ -1371,7 +1371,7 @@ do + for (c = 0; c < 16; c++) start_bits[c] |= map[c]; + for (c = 128; c < 256; c++) + { +- if ((map[c/8] && (1 << (c&7))) != 0) ++ if ((map[c/8] & (1 << (c&7))) != 0) + { + int d = (c >> 6) | 0xc0; /* Set bit for this starter */ + start_bits[d/8] |= (1 << (d&7)); /* and then skip on to the */ +-- +2.5.0 + diff --git a/pcre.spec b/pcre.spec index 6afcae5..9efd7f1 100644 --- a/pcre.spec +++ b/pcre.spec @@ -84,6 +84,8 @@ Patch15: pcre-8.38-Fix-pcretest-loop-for-global-matching-with-an-ovecto.patch # Fix a non-diagnosis of missing assection after (?(?C) that could corrupt # process stack, upstream bug #1780, fixed in upstream after 8.38 Patch16: pcre-8.38-Fix-non-diagnosis-of-missing-assertion-after-C.patch +# Fix a typo in pcre_study() +Patch17: pcre-8.38-Fix-typo-in-pcre_study.patch BuildRequires: readline-devel BuildRequires: autoconf BuildRequires: automake @@ -149,6 +151,7 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest. %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 # Because of rpath patch libtoolize --copy --force autoreconf -vif @@ -223,6 +226,7 @@ make %{?_smp_mflags} check VERBOSE=yes * Mon Feb 29 2016 Petr Pisar - 8.38-9 - Fix a non-diagnosis of missing assection after (?(?C) that could corrupt process stack (upstream bug #1780) +- Fix a typo in pcre_study() * Mon Feb 29 2016 Petr Pisar - 8.38-8 - Fix CVE-2016-1283 (a heap buffer overflow in handling of nested duplicate