This the fork that true-upstream seems to prefer, see: https://www.7-zip.org/links.htmlwip/yesman
parent
3a70659b4d
commit
955701709f
@ -1,23 +0,0 @@ |
||||
From: Robert Luberda <robert@debian.org>
|
||||
Date: Sat, 19 Nov 2016 08:48:08 +0100
|
||||
Subject: Fix nullptr dereference (CVE-2016-9296)
|
||||
|
||||
Patch taken from https://sourceforge.net/p/p7zip/bugs/185/
|
||||
---
|
||||
CPP/7zip/Archive/7z/7zIn.cpp | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CPP/7zip/Archive/7z/7zIn.cpp b/CPP/7zip/Archive/7z/7zIn.cpp
|
||||
index b0c6b98..7c6dde2 100644
|
||||
--- a/CPP/7zip/Archive/7z/7zIn.cpp
|
||||
+++ b/CPP/7zip/Archive/7z/7zIn.cpp
|
||||
@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedStreams(
|
||||
if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
|
||||
ThrowIncorrect();
|
||||
}
|
||||
- HeadersSize += folders.PackPositions[folders.NumPackStreams];
|
||||
+ if (folders.PackPositions)
|
||||
+ HeadersSize += folders.PackPositions[folders.NumPackStreams];
|
||||
return S_OK;
|
||||
}
|
||||
|
@ -1,35 +0,0 @@ |
||||
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(-)
|
||||
|
||||
diff --git a/CPP/7zip/Compress/ShrinkDecoder.cpp b/CPP/7zip/Compress/ShrinkDecoder.cpp
|
||||
index 80b7e67..ca37764 100644
|
||||
--- a/CPP/7zip/Compress/ShrinkDecoder.cpp
|
||||
+++ b/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;
|
||||
|
Loading…
Reference in new issue