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;
 }
 
</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=5a5b729d662c6ad069548b1e4331b7f51c31616b'>refs</a><a class='active' href='/guix/log/README'>log</a><a href='/guix/tree/README?id=5a5b729d662c6ad069548b1e4331b7f51c31616b'>tree</a><a href='/guix/commit/README?id=5a5b729d662c6ad069548b1e4331b7f51c31616b'>commit</a><a href='/guix/diff/README?id=5a5b729d662c6ad069548b1e4331b7f51c31616b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/README'>
<input type='hidden' name='id' value='5a5b729d662c6ad069548b1e4331b7f51c31616b'/><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=5a5b729d662c6ad069548b1e4331b7f51c31616b'>root</a>/<a href='/guix/log/README?id=5a5b729d662c6ad069548b1e4331b7f51c31616b'>README</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/README?id=5a5b729d662c6ad069548b1e4331b7f51c31616b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-05-20 01:58:04 +0200'>2021-05-20</span></td><td><a href='/guix/commit/README?id=c0087d33705f53cc3619a1a43a33602aaecc3a8b'>The #guix channel is hosted by Libera Chat.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2020-10-23 12:57:20 -0400'>2020-10-23</span></td><td><a href='/guix/commit/README?id=b5aaa3a4fb985d21e21e2a67f48b52f13ebd4728'>doc: Update README.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
<tr><td><span title='2020-10-22 22:47:54 -0400'>2020-10-22</span></td><td><a href='/guix/commit/README?id=503d2bfde08f9bf97bbf430516d2f19faedd4319'>README: Refer to the manual for building from Git.</a><span class='msg-avail'>...</span></td><td>Maxim Cournoyer</td></tr>
s/swh.scm?id=749b9582061f7d929be83a194040b63b41afec81'>swh: Adjust 'origin' test.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-02 15:25:01 +0200'>2019-09-02</span></td><td><a href='/guix/commit/tests/swh.scm?id=ba1c1853a79a5930ca7db7a6b368859f805df98d'>swh: Add hooks for rate limiting handling.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-09-02 15:25:01 +0200'>2019-09-02</span></td><td><a href='/guix/commit/tests/swh.scm?id=9323ab550f3bcb75fcaefbb20847595974702d5b'>tests: 'with-http-server' accepts multiple responses.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-07-22 11:53:39 +0200'>2019-07-22</span></td><td><a href='/guix/commit/tests/swh.scm?id=96f1cbeff84819f9886d15763b4c477cdecd7784'>swh: Add basic tests.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>