summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch')
-rw-r--r--meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch27
1 files changed, 0 insertions, 27 deletions
diff --git a/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch b/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch
deleted file mode 100644
index 98e186cbf0..0000000000
--- a/meta-oe/recipes-extended/p7zip/files/CVE-2016-9296.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1p7zip: Update CVE-2016-9296 patch URL.
2From: Robert Luberda <robert@debian.org>
3Date: Sat, 19 Nov 2016 08:48:08 +0100
4Subject: Fix nullptr dereference (CVE-2016-9296)
5
6Patch taken from https://sourceforge.net/p/p7zip/bugs/185/
7This patch file taken from Debian's patch set for p7zip
8
9Upstream-Status: Backport [https://sourceforge.net/p/p7zip/bugs/185/]
10CVE: CVE-2016-9296
11
12Signed-off-by: Virendra Thakur <virendra.thakur@kpit.com>
13
14Index: p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp
15===================================================================
16--- p7zip_16.02.orig/CPP/7zip/Archive/7z/7zIn.cpp
17+++ p7zip_16.02/CPP/7zip/Archive/7z/7zIn.cpp
18@@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedS
19 if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
20 ThrowIncorrect();
21 }
22- HeadersSize += folders.PackPositions[folders.NumPackStreams];
23+ if (folders.PackPositions)
24+ HeadersSize += folders.PackPositions[folders.NumPackStreams];
25 return S_OK;
26 }
27