mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 03:51:01 +00:00
1b1cf2be1e
References: https://nvd.nist.gov/vuln/detail/CVE-2018-5996 https://nvd.nist.gov/vuln/detail/CVE-2016-9296 Upstream patches: https://sources.debian.org/data/non-free/p/p7zip-rar/16.02-3/debian/patches/06-CVE-2018-5996.patch https://snapshot.debian.org/archive/debian-debug/20180205T215659Z/pool/main/p/p7zip/p7zip_16.02%2Bdfsg-6.debian.tar.xz Signed-off-by: Zahir Hussain <zahir.basha@kpit.com> Signed-off-by: aszh07 <mail2szahir@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
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/
|
|
|
|
CVE: CVE-2016-9296
|
|
|
|
Upstream-Status: Backport [https://snapshot.debian.org/archive/debian-debug/20180205T215659Z/pool/main/p/p7zip/p7zip_16.02%2Bdfsg-6.debian.tar.xz]
|
|
|
|
Signed-off-by: Zahir Hussain <zahir.basha@kpit.com>
|
|
Signed-off-by: aszh07 <mail2szahir@gmail.com>
|
|
---
|
|
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;
|
|
}
|
|
|