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;
 }
 
h'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=aaad1a19e8608e048bb537e95031b8c8103bc1cc'>refs</a><a class='active' href='/guix/log/guix.scm'>log</a><a href='/guix/tree/guix.scm?id=aaad1a19e8608e048bb537e95031b8c8103bc1cc'>tree</a><a href='/guix/commit/guix.scm?id=aaad1a19e8608e048bb537e95031b8c8103bc1cc'>commit</a><a href='/guix/diff/guix.scm?id=aaad1a19e8608e048bb537e95031b8c8103bc1cc'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/guix.scm'>
<input type='hidden' name='id' value='aaad1a19e8608e048bb537e95031b8c8103bc1cc'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=aaad1a19e8608e048bb537e95031b8c8103bc1cc'>root</a>/<a href='/guix/log/guix.scm?id=aaad1a19e8608e048bb537e95031b8c8103bc1cc'>guix.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/guix.scm?id=aaad1a19e8608e048bb537e95031b8c8103bc1cc&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-07-12 01:17:45 +0200'>2022-07-12</span></td><td><a href='/guix/commit/guix.scm?id=4574ef267e543bcac97d9c400f30cb731df29181'>guix: Really export 'define-public'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 3858275962f1ac567b5dce2355035f9eddea0a05, which
didn't have any effect.

* guix.scm: Explicitly use (guix packages) so #:re-export-and-replace
is effective.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-09-14 11:50:58 +0200'>2021-09-14</span></td><td><a href='/guix/commit/guix.scm?id=3858275962f1ac567b5dce2355035f9eddea0a05'>guix: Replace 'define-public'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 8531997d2a1e10d574a6e9ab70bc86ade6af4733.

* guix.scm: Use #:re-export-and-replace for 'define-public'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-06-29 00:00:13 +0200'>2021-06-29</span></td><td><a href='/guix/commit/guix.scm?id=e059adcb6001ab0353d969b24030d0c342f8830e'>(guix) no longer pulls in (guix ftp-client).</a><span class='msg-avail'>...<span class='msg-tooltip'>That choice was made in 2014 and never made much sense.

* guix.scm (%public-modules): Remove 'ftp-client'.
</span></span></td><td>Ludovic Courtès</td></tr>