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=7e463dd16b7e273011f0beafa57a89fa2d525f8b'>refs</a><a class='active' href='/guix/log/gnu/services/auditd.scm'>log</a><a href='/guix/tree/gnu/services/auditd.scm?id=7e463dd16b7e273011f0beafa57a89fa2d525f8b'>tree</a><a href='/guix/commit/gnu/services/auditd.scm?id=7e463dd16b7e273011f0beafa57a89fa2d525f8b'>commit</a><a href='/guix/diff/gnu/services/auditd.scm?id=7e463dd16b7e273011f0beafa57a89fa2d525f8b'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/auditd.scm'>
<input type='hidden' name='id' value='7e463dd16b7e273011f0beafa57a89fa2d525f8b'/><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=7e463dd16b7e273011f0beafa57a89fa2d525f8b'>root</a>/<a href='/guix/log/gnu?id=7e463dd16b7e273011f0beafa57a89fa2d525f8b'>gnu</a>/<a href='/guix/log/gnu/services?id=7e463dd16b7e273011f0beafa57a89fa2d525f8b'>services</a>/<a href='/guix/log/gnu/services/auditd.scm?id=7e463dd16b7e273011f0beafa57a89fa2d525f8b'>auditd.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/services/auditd.scm?id=7e463dd16b7e273011f0beafa57a89fa2d525f8b&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-07-27 12:06:36 +0200'>2020-07-27</span></td><td><a href='/guix/commit/gnu/services/auditd.scm?id=73cb3e103f35356b83cb091f15c536c21bf53981'>services: auditd: Provide default configuration directory.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/auditd.scm (auditd.conf)
(%default-auditd-configuration-directory): New variables.
(&lt;auditd-configuration&gt;): Switch to 'define-record-type*'.
[configuration-directory]: New field.
(auditd-shepherd-service): Honor 'configuration-directory'.  Pass #:pid-file.
(auditd-service-type)[description]: Tweak.
[default-value]: Provide 'configuration-directory'.
* doc/guix.texi (Miscellaneous Services): Update docs to reflect
changes.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Robin Green</td></tr>
<tr><td><span title='2019-06-06 22:23:35 +0200'>2019-06-06</span></td><td><a href='/guix/commit/gnu/services/auditd.scm?id=07023ebc1892a559cad1f80235a4afb0955b29ab'>services: Add auditd.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/auditd.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* doc/guix.texi (Miscellaneous Services): Document it.
</span></span></td><td>Danny Milosavljevic</td></tr>