kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add patch from CVE-2017-17969

Browse source 
Heap-based buffer overflow in 7zip/Compress/ShrinkDecoder.cpp.

Obtained from:	Debian (link in the actual patch)
MFH:		2018Q1
Security:	6d337396-0e4a-11e8-94c0-5453ed2e2b49
This commit is contained in:
Raphael Kubo da Costa 2018-02-10 10:59:11 +00:00
parent 72ac4629a5
commit 79b7e05712
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=461379
2 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
archivers/p7zip/Makefile
View file

@ -3,7 +3,7 @@
PORTNAME= p7zip
PORTVERSION= 16.02
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES= archivers
MASTER_SITES= SF
DISTNAME= ${PORTNAME}_${DISTVERSION}_src_all

35
archivers/p7zip/files/patch-CVE-2017-17969 Normal file
View file

@ -0,0 +1,35 @@
Obtained-from: https://anonscm.debian.org/cgit/users/robert/p7zip.git/tree/debian/patches/13-CVE-2017-17969.patch
---
From: =?utf-8?q?Antoine_Beaupr=C3=A9?= <anarcat@debian.org>
Date: Fri, 2 Feb 2018 11:11:41 +0100
Subject: Heap-based buffer overflow in 7zip/Compress/ShrinkDecoder.cpp
Origin: vendor, https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/27d7/attachment/CVE-2017-17969.patch
Forwarded: https://sourceforge.net/p/p7zip/bugs/_discuss/thread/0920f369/#27d7
Bug: https://sourceforge.net/p/p7zip/bugs/204/
Bug-Debian: https://bugs.debian.org/888297
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2017-17969
Reviewed-by: Salvatore Bonaccorso <carnil@debian.org>
Last-Update: 2018-02-01
Applied-Upstream: 18.00-beta
---
CPP/7zip/Compress/ShrinkDecoder.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
--- CPP/7zip/Compress/ShrinkDecoder.cpp
+++ CPP/7zip/Compress/ShrinkDecoder.cpp
@@ -121,8 +121,13 @@ HRESULT CDecoder::CodeReal(ISequentialInStream *inStream, ISequentialOutStream *
{
_stack[i++] = _suffixes[cur];
cur = _parents[cur];
+ if (cur >= kNumItems || i >= kNumItems)
+ break;
}
-
+
+ if (cur >= kNumItems || i >= kNumItems)
+ break;
+
_stack[i++] = (Byte)cur;
lastChar2 = (Byte)cur;