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;
 }
 
bmit' 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=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>refs</a><a class='active' href='/guix/log/gnu/system/vm.scm'>log</a><a href='/guix/tree/gnu/system/vm.scm?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>tree</a><a href='/guix/commit/gnu/system/vm.scm?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>commit</a><a href='/guix/diff/gnu/system/vm.scm?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/system/vm.scm'>
<input type='hidden' name='id' value='0cbc175c8bd3aecd837f1b0cd266e0deab177f40'/><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=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>root</a>/<a href='/guix/log/gnu?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>gnu</a>/<a href='/guix/log/gnu/system?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>system</a>/<a href='/guix/log/gnu/system/vm.scm?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40'>vm.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/system/vm.scm?id=0cbc175c8bd3aecd837f1b0cd266e0deab177f40&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-04-17 12:13:01 +0200'>2024-04-17</span></td><td><a href='/guix/commit/gnu/system/vm.scm?id=d33965908dc8e21e9c9834ce1061cdcc664295ab'>vm: Always use a native emulator in ‘guix system vm’.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-03-31 22:28:11 +0200'>2024-03-31</span></td><td><a href='/guix/commit/gnu/system/vm.scm?id=16c713083516e60b5ae30b3a8b49d5bf8d4cadc3'>vm: If not the same local architecture, don't enable kvm.</a><span class='msg-avail'>...</span></td><td>Zheng Junjie</td></tr>
<tr><td><span title='2024-03-31 22:28:01 +0200'>2024-03-31</span></td><td><a href='/guix/commit/gnu/system/vm.scm?id=e6241de15a2aa04efc99769d768849240eaffea5'>vm: add arguments to use virt machine type for qemu-riscv64.</a><span class='msg-avail'>...</span></td><td>Zheng Junjie</td></tr>
<tr><td><span title='2024-03-31 22:27:02 +0200'>2024-03-31</span></td><td><a href='/guix/commit/gnu/system/vm.scm?id=ad9832f82e525834db2221ae462f2b7a6709fc05'>vm: When target riscv64-linux, use u-boot-qemu-riscv64-bootloader.</a><span class='msg-avail'>...</span></td><td>Zheng Junjie</td></tr>
<tr><td><span title='2024-03-31 22:26:27 +0200'>2024-03-31</span></td><td><a href='/guix/commit/gnu/system/vm.scm?id=a5deb90fd45872e0f4e3c2446b9848e1ea592068'>vm: use #$ for kernel-arguments.</a><span class='msg-avail'>...</span></td><td>Zheng Junjie</td></tr>
<tr><td><span title='2024-02-10 23:21:07 +0100'>2024-02-10</span></td><td><a href='/guix/commit/gnu/system/vm.scm?id=9edbb2d7a40c9da7583a1046e39b87633459f656'>services: Add ‘virtual-build-machine’ service.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-02-10 22:59:52 +0100'>2024-02-10</span></td><td><a href='/guix/commit/gnu/system/vm.scm?id=b0a5c0742f7e5cf0df4c0f20dbbb720df1311a70'>vm: Add ‘cpu-count’ field to &lt;virtual-machine&gt;.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-02-10 22:59:49 +0100'>2024-02-10</span></td><td><a href='/guix/commit/gnu/system/vm.scm?id=7a4f585ae1875b1bee29e1f106c7af5ca0cd057d'>vm: Export &lt;virtual-machine&gt; accessors.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2024-02-10 22:59:46 +0100'>2024-02-10</span></td><td><a href='/guix/commit/gnu/system/vm.scm?id=f7447b1a32c5dc79d34a6bc9e66cca03ecb5cf56'>vm: Add ‘date’ field to &lt;virtual-machine&gt;.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-10-29 02:00:00 +0200'>2023-10-29</span></td><td><a href='/guix/commit/gnu/system/vm.scm?id=2059b9fbe0712e070b6e438b91484c170bf599ff'>system: vm: Include the cirrus driver in the initrd.</a><span class='msg-avail'>...</span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2023-10-01 22:58:18 +0200'>2023-10-01</span></td><td><a href='/guix/commit/gnu/system/vm.scm?id=f5c3f8e59e266f9fef629fb6a86a133fbc92a537'>system: vm: Remove unused variable.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>