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;
 }
 
put 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=3211f45f0b741d5dea97de3745804881d7446d34'>refs</a><a class='active' href='/guix/log/gnu/packages/bdw-gc.scm'>log</a><a href='/guix/tree/gnu/packages/bdw-gc.scm?id=3211f45f0b741d5dea97de3745804881d7446d34'>tree</a><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=3211f45f0b741d5dea97de3745804881d7446d34'>commit</a><a href='/guix/diff/gnu/packages/bdw-gc.scm?id=3211f45f0b741d5dea97de3745804881d7446d34'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/bdw-gc.scm'>
<input type='hidden' name='id' value='3211f45f0b741d5dea97de3745804881d7446d34'/><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=3211f45f0b741d5dea97de3745804881d7446d34'>root</a>/<a href='/guix/log/gnu?id=3211f45f0b741d5dea97de3745804881d7446d34'>gnu</a>/<a href='/guix/log/gnu/packages?id=3211f45f0b741d5dea97de3745804881d7446d34'>packages</a>/<a href='/guix/log/gnu/packages/bdw-gc.scm?id=3211f45f0b741d5dea97de3745804881d7446d34'>bdw-gc.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/packages/bdw-gc.scm?id=3211f45f0b741d5dea97de3745804881d7446d34&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2018-08-21 17:24:29 +0200'>2018-08-21</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=e63199ec68747a590f7429a575302917857c37dd'>gnu: libatomic-ops: Update to 7.6.6.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-07-19 23:25:06 +0200'>2018-07-19</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=1d3de9796778f5a11dc91c666ec2f19e8dd56969'>gnu: libgc: Update to 7.6.6.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-03-27 15:42:52 +0200'>2018-03-27</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=fbeca8cec643ebbaf4aa2fa42a70ec87d0ff6c52'>gnu: libatomic-ops: Update to 7.6.4.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2018-02-19 21:50:09 -0500'>2018-02-19</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=7b8acffd60fde8e53d04d5cd3d31c4823f54cd3c'>gnu: libatomic-ops: Update to 7.6.2.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2018-02-19 21:50:09 -0500'>2018-02-19</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=58f58cb44b2d930f2ca407d57642064cc09718e9'>gnu: libgc: Update to 7.6.4.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2017-11-28 14:24:09 +0100'>2017-11-28</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=1be8a432457827830d20c6deaca8a3d372ad0753'>gnu: libatomic-ops: Update to 7.4.8.</a><span class='msg-avail'>...</span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2017-09-28 00:13:10 +0200'>2017-09-28</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=4cb87d63e1c06eb99f90f33bd8a68d73975e4d72'>gnu: libgc: Add 'libgc-back-pointers' variant.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-05-02 18:14:24 +0300'>2017-05-02</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=ed788c31cfac5ec864ad45fb09b2d014fc62461b'>gnu: libgc: Fix Check for Hurd systems.</a><span class='msg-avail'>...</span></td><td>rennes</td></tr>
<tr><td><span title='2016-11-23 23:11:30 -0500'>2016-11-23</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=c8d1e7a1308e3c83aeb556be7d5b1e1836544e95'>gnu: libgc-7.2: Remove package.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2016-11-21 14:24:29 -0500'>2016-11-21</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=4b269baf44d02c00ff3a09743ce4224cfbdc312b'>gnu: libgc: Update to 7.6.0.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2016-11-21 14:24:28 -0500'>2016-11-21</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=a8ce976fe6e151a14b1a5ad48f652931ef67ca40'>gnu: libgc-7.2: Update to 7.2g.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>
<tr><td><span title='2016-11-21 14:17:29 -0500'>2016-11-21</span></td><td><a href='/guix/commit/gnu/packages/bdw-gc.scm?id=a373c68588498c7f2316227f020036e49ec648c5'>gnu: libatomic-ops: Update to 7.4.4.</a><span class='msg-avail'>...</span></td><td>Leo Famulari</td></tr>