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;
 }
 
koszko-scripts'>koszko-scripts</option>
</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=c76d0dbcba5ecce041506cc46be42be97a4f300c'>refs</a><a class='active' href='/guix/log/gnu/tests/desktop.scm?showmsg=1'>log</a><a href='/guix/tree/gnu/tests/desktop.scm?id=c76d0dbcba5ecce041506cc46be42be97a4f300c'>tree</a><a href='/guix/commit/gnu/tests/desktop.scm?id=c76d0dbcba5ecce041506cc46be42be97a4f300c'>commit</a><a href='/guix/diff/gnu/tests/desktop.scm?id=c76d0dbcba5ecce041506cc46be42be97a4f300c'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/tests/desktop.scm'>
<input type='hidden' name='id' value='c76d0dbcba5ecce041506cc46be42be97a4f300c'/><input type='hidden' name='showmsg' value='1'/><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=c76d0dbcba5ecce041506cc46be42be97a4f300c&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=c76d0dbcba5ecce041506cc46be42be97a4f300c&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/tests?id=c76d0dbcba5ecce041506cc46be42be97a4f300c&amp;showmsg=1'>tests</a>/<a href='/guix/log/gnu/tests/desktop.scm?id=c76d0dbcba5ecce041506cc46be42be97a4f300c&amp;showmsg=1'>desktop.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/tests/desktop.scm?id=c76d0dbcba5ecce041506cc46be42be97a4f300c'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2018-12-06 21:18:03 +0100'>2018-12-06</span></td><td class='logsubject'><a href='/guix/commit/gnu/tests/desktop.scm?id=d553ee80828e4b4eb7be59f5278e5d1696b935a0'>tests: elogind: Adjust to elogind output change.</a></td><td>Marius Bakke</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This is a follow-up to commit 4163f2467bce1a6123f0da1c49e88751d93e634b.

* gnu/tests/desktop.scm (run-elogind-test): s|/dev/tty1/tty1.


</td></tr>
<tr class='logheader'><td><span title='2017-09-08 00:11:21 +0200'>2017-09-08</span></td><td class='logsubject'><a href='/guix/commit/gnu/tests/desktop.scm?id=cd1ad27e6cdf90230d07efc18a8fcfe45494aad0'>gnu: elogind: Use itself as the cgroup controller.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes a regression introduced in
fa67d5654176b4b815832eaf259188e1486c65ab whereby elogind would fail to
start with:

  Cannot determine cgroup we are running in: No data available
  Out of memory.

thereby preventing log-in altogether.

* gnu/packages/freedesktop.scm (elogind)[arguments]: Pass
"--with-cgroup-controller=elogind".
* gnu/tests/desktop.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.


</td></tr>