diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-02-13 22:35:05 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-02-13 22:35:05 +0100 |
| commit | 424b1ae76901c538457bd3c30d9d9cf67e79855f (patch) | |
| tree | acc35c1160625618cd6083e728c6a4ff7e9cccc9 /gnu/packages/patches/p7zip-CVE-2016-9296.patch | |
| parent | a50e03014177d2f00b5b85d3e1c295406f842016 (diff) | |
| parent | eae2dbd47ac1f4a201b8584e2f88c30cd28e093a (diff) | |
Merge branch 'master' into python-tests
Diffstat (limited to 'gnu/packages/patches/p7zip-CVE-2016-9296.patch')
| -rw-r--r-- | gnu/packages/patches/p7zip-CVE-2016-9296.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gnu/packages/patches/p7zip-CVE-2016-9296.patch b/gnu/packages/patches/p7zip-CVE-2016-9296.patch new file mode 100644 index 0000000000..3fa80377ad --- /dev/null +++ b/gnu/packages/patches/p7zip-CVE-2016-9296.patch @@ -0,0 +1,24 @@ +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/ +This patch file taken from Debian's patch set for p7zip +--- + 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; + } + |