0001-CVE-2016-9296.patch 859 B

12345678910111213141516171819202122232425
  1. From: Robert Luberda <robert@debian.org>
  2. Date: Sat, 19 Nov 2016 08:48:08 +0100
  3. Subject: Fix nullptr dereference (CVE-2016-9296)
  4. Patch taken from https://sourceforge.net/p/p7zip/bugs/185/
  5. Signed-off-by: André Hentschel <nerv@dawncrow.de>
  6. ---
  7. CPP/7zip/Archive/7z/7zIn.cpp | 3 ++-
  8. 1 file changed, 2 insertions(+), 1 deletion(-)
  9. diff --git a/CPP/7zip/Archive/7z/7zIn.cpp b/CPP/7zip/Archive/7z/7zIn.cpp
  10. index b0c6b98..7c6dde2 100644
  11. --- a/CPP/7zip/Archive/7z/7zIn.cpp
  12. +++ b/CPP/7zip/Archive/7z/7zIn.cpp
  13. @@ -1097,7 +1097,8 @@ HRESULT CInArchive::ReadAndDecodePackedStreams(
  14. if (CrcCalc(data, unpackSize) != folders.FolderCRCs.Vals[i])
  15. ThrowIncorrect();
  16. }
  17. - HeadersSize += folders.PackPositions[folders.NumPackStreams];
  18. + if (folders.PackPositions)
  19. + HeadersSize += folders.PackPositions[folders.NumPackStreams];
  20. return S_OK;
  21. }