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;
 }
 

</select> <input type='submit' value='switch'/></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=f975f82d055e655699e64128ca654bcffd5f0d96'>refs</a><a class='active' href='/guix/log/gnu/installer/newt/network.scm'>log</a><a href='/guix/tree/gnu/installer/newt/network.scm?id=f975f82d055e655699e64128ca654bcffd5f0d96'>tree</a><a href='/guix/commit/gnu/installer/newt/network.scm?id=f975f82d055e655699e64128ca654bcffd5f0d96'>commit</a><a href='/guix/diff/gnu/installer/newt/network.scm?id=f975f82d055e655699e64128ca654bcffd5f0d96'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/newt/network.scm'>
<input type='hidden' name='id' value='f975f82d055e655699e64128ca654bcffd5f0d96'/><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=f975f82d055e655699e64128ca654bcffd5f0d96'>root</a>/<a href='/guix/log/gnu?id=f975f82d055e655699e64128ca654bcffd5f0d96'>gnu</a>/<a href='/guix/log/gnu/installer?id=f975f82d055e655699e64128ca654bcffd5f0d96'>installer</a>/<a href='/guix/log/gnu/installer/newt?id=f975f82d055e655699e64128ca654bcffd5f0d96'>newt</a>/<a href='/guix/log/gnu/installer/newt/network.scm?id=f975f82d055e655699e64128ca654bcffd5f0d96'>network.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/gnu/installer/newt/network.scm?id=f975f82d055e655699e64128ca654bcffd5f0d96&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-06-08 02:30:25 +0200'>2019-06-08</span></td><td><a href='/guix/commit/gnu/installer/newt/network.scm?id=232a7e69cea759bcb2ee6687b1ca9b79bb2f257e'>installer: Fix typo.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/newt/network.scm (run-technology-page): Fix plural typo.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-05-06 23:21:33 +0200'>2019-05-06</span></td><td><a href='/guix/commit/gnu/installer/newt/network.scm?id=46c102ca5e76ffc1daa42edba439eee9fd0f102c'>installer: Skip network selection dialogs when there is no choice.</a><span class='msg-avail'>...<span class='msg-tooltip'>Previously, for a machine that only has wired networking, and only one
such network, we'd have to go through two selection boxes.  Now we just
skip both.

* gnu/installer/newt/ethernet.scm (run-ethernet-page): When
'ethernet-services' returns one element, return it directly without
opening a listbox selection.
* gnu/installer/newt/network.scm (run-technology-page): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-05-06 23:21:33 +0200'>2019-05-06</span></td><td><a href='/guix/commit/gnu/installer/newt/network.scm?id=d1e5f758e128a3c1042c98563c5b87b81b2f187a'>installer: Shrink simple listboxes to their minimum height.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/newt/partition.scm (run-partioning-page): Pass
 #:listbox-height.
(run-scheme-page): Likewise.
(run-device-page): Likewise.
* gnu/installer/newt/network.scm (run-technology-page): Likewise.
* gnu/installer/newt/ethernet.scm (run-ethernet-page): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>