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;
 }
 
t 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=78ab71ce1daa835a36d6a1b54f6fac69fdd91283'>refs</a><a class='active' href='/guix/log/gnu/packages/bootstrap'>log</a><a href='/guix/tree/gnu/packages/bootstrap?id=78ab71ce1daa835a36d6a1b54f6fac69fdd91283'>tree</a><a href='/guix/commit/gnu/packages/bootstrap?id=78ab71ce1daa835a36d6a1b54f6fac69fdd91283'>commit</a><a href='/guix/diff/gnu/packages/bootstrap?id=78ab71ce1daa835a36d6a1b54f6fac69fdd91283'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/bootstrap'>
<input type='hidden' name='id' value='78ab71ce1daa835a36d6a1b54f6fac69fdd91283'/><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=78ab71ce1daa835a36d6a1b54f6fac69fdd91283'>root</a>/<a href='/guix/log/gnu?id=78ab71ce1daa835a36d6a1b54f6fac69fdd91283'>gnu</a>/<a href='/guix/log/gnu/packages?id=78ab71ce1daa835a36d6a1b54f6fac69fdd91283'>packages</a>/<a href='/guix/log/gnu/packages/bootstrap?id=78ab71ce1daa835a36d6a1b54f6fac69fdd91283'>bootstrap</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/bootstrap?id=78ab71ce1daa835a36d6a1b54f6fac69fdd91283&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-02-20 12:58:07 +0200'>2017-02-20</span></td><td><a href='/guix/commit/gnu/packages/bootstrap?id=3b88f3767d9f3ad2cc64173525cd53d429bfe7e7'>gnu: Add bootstrap-binaries for 'aarch64-linux'.</a><span class='msg-avail'>...<span class='msg-tooltip'>These bootstrap-binaries were built against commit
8f8f250bdca917b3ce38aa0902f01b19081859a4.

* gnu/packages/bootstrap/aarch64-linux/bash,
gnu/packages/bootstrap/aarch64-linux/mkdir,
gnu/packages/bootstrap/aarch64-linux/xz,
gnu/packages/bootstrap/aarch64-linux/tar: New files.

* gnu/local.mk (bootstrap_aarch64_linuxdir)
(dist_bootstrap_aarch64_linux_DATA)
(nodist_bootstrap_aarch64_linux_DATA): New variables.
(DISTCLEANFILES): Add $(nodist_bootstrap_aarch64_linux_DATA).
(gnu/packages/bootstrap/aarch64-linux/guile-2.0.14.tar.xz): New target.
* build-aux/download.scm (filename-&gt;uri): Add aarch64-linux entry.
* gnu/packages/bootstrap.scm (raw-build): Use guile-2.0.14.tar.xz on
aarch64-linux.
(glibc-dynamic-linker, %bootstrap-coreutils&amp;co, %boostrap-binutils)
(%bootstrap-glibc, %bootstrap-gcc): Add aarch64-linux cases.
* m4/guix.m4 (GUIX_SYSTEM_TYPE): Add aarch64 case.
(GUIX_ASSERT_SUPPORTED_SYSTEM): Add aarch64-linux to supported list.
* doc/guix.texi (GNU Distribution): Add aarch64-linux to the list of
supported systems.
* tests/packages.scm (package-search-derivation, snippet): Add aarch64
case.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2015-03-31 23:07:17 +0200'>2015-03-31</span></td><td><a href='/guix/commit/gnu/packages/bootstrap?id=4c0d38bee3a4b264490f33adf45bb226c110716c'>gnu: Update bootstrap binaries for x86_64 and i686.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;http://bugs.gnu.org/19780&gt;.
Reported by Ricardo Wurmus &lt;ricardo.wurmus@mdc-berlin.de&gt;.

* gnu/packages/bootstrap/i686-linux/bash,
  gnu/packages/bootstrap/i686-linux/mkdir,
  gnu/packages/bootstrap/i686-linux/tar,
  gnu/packages/bootstrap/i686-linux/xz,
  gnu/packages/bootstrap/x86_64-linux/bash,
  gnu/packages/bootstrap/x86_64-linux/mkdir,
  gnu/packages/bootstrap/x86_64-linux/tar,
  gnu/packages/bootstrap/x86_64-linux/xz: Update from
  &lt;ftp://alpha.gnu.org:/gnu/guix/bootstrap/i686-linux/20131110/static-binaries.tar.xz&gt;
  and
  &lt;ftp://alpha.gnu.org:/gnu/guix/bootstrap/x86_64-linux/20131110/static-binaries.tar.xz&gt;,
  respectively.  The libc in those binaries has no dynamic NSS support,
  which could otherwise lead to crashes when they tried to load NSS
  modules of the host system.
</span></span></td><td>Ludovic Courtès</td></tr>