rpms/pcre
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix a crash in pcretest when \O directive was supplied with too big number

Browse Source
This commit is contained in:
Petr Písař 2017-02-24 10:18:12 +01:00
parent be6a110b85
commit 1f6fbc3882
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pcre-8.40-Make-pcretest-check-size-of-O-argument.patch Normal file
View File

@ -0,0 +1,37 @@
From 312dd5d85714f73c247131b541405cf0bf24581b Mon Sep 17 00:00:00 2001
From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
Date: Thu, 23 Feb 2017 16:24:08 +0000
Subject: [PATCH] Make pcretest check size of \O argument.
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@1686 2f5784b3-3f2a-0410-8824-cb99058d5e15
Petr Písař: Ported to 8.40.
diff --git a/pcretest.c b/pcretest.c
index 797f99c..0a153be 100644
--- a/pcretest.c
+++ b/pcretest.c
@@ -4834,7 +4834,16 @@ while (!done)
continue;
case 'O':
- while(isdigit(*p)) n = n * 10 + *p++ - '0';
+ while(isdigit(*p))
+ {
+ if (n > (INT_MAX-10)/10) /* Hack to stop fuzzers */
+ {
+ printf("** \\O argument is too big\n");
+ yield = 1;
+ goto EXIT;
+ }
+ n = n * 10 + *p++ - '0';
+ }
if (n > size_offsets_max)
{
size_offsets_max = n;
--
2.7.4

10
pcre.spec
View File

@ -2,7 +2,7 @@
#%%global rcversion RC1 #%%global rcversion RC1
Name: pcre Name: pcre
Version: 8.40 Version: 8.40
Release: %{?rcversion:0.}4%{?rcversion:.%rcversion}%{?dist} Release: %{?rcversion:0.}5%{?rcversion:.%rcversion}%{?dist}
%global myversion %{version}%{?rcversion:-%rcversion} %global myversion %{version}%{?rcversion:-%rcversion}
Summary: Perl-compatible regular expression library Summary: Perl-compatible regular expression library
Group: System Environment/Libraries Group: System Environment/Libraries
@ -49,6 +49,9 @@ Patch5: pcre-8.40-Fix-recognition-of-style-comment-between-quantifier-.patch
# Fix a crash in pcretest when printing non-ASCII characters, # Fix a crash in pcretest when printing non-ASCII characters,
# upstream bug #2043, in upstream after 8.40 # upstream bug #2043, in upstream after 8.40
Patch6: pcre-8.40-Check-character-256-for-isprint-in-pcretest.patch Patch6: pcre-8.40-Check-character-256-for-isprint-in-pcretest.patch
# Fix a crash in pcretest when \O directive was supplied with too big number,
# upstream bug #2044, in upstream after 8.40
Patch7: pcre-8.40-Make-pcretest-check-size-of-O-argument.patch
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
@ -143,6 +146,7 @@ Utilities demonstrating PCRE capabilities like pcregrep or pcretest.
%patch4 -p1 %patch4 -p1
%patch5 -p1 %patch5 -p1
%patch6 -p1 %patch6 -p1
%patch7 -p1
# Because of rpath patch # Because of rpath patch
libtoolize --copy --force libtoolize --copy --force
autoreconf -vif autoreconf -vif
@ -239,6 +243,10 @@ make %{?_smp_mflags} check VERBOSE=yes
%{_mandir}/man1/pcretest.* %{_mandir}/man1/pcretest.*
%changelog %changelog
* Fri Feb 24 2017 Petr Pisar <ppisar@redhat.com> - 8.40-5
- Fix a crash in pcretest when \O directive was supplied with too big number
(upstream bug #2044)
* Thu Feb 23 2017 Petr Pisar <ppisar@redhat.com> - 8.40-4 * Thu Feb 23 2017 Petr Pisar <ppisar@redhat.com> - 8.40-4
- Fix a crash in pcretest when printing non-ASCII characters - Fix a crash in pcretest when printing non-ASCII characters
(upstream bug #2043) (upstream bug #2043)