From 754137e70cf58a64ad524b704a86b651ba0cde07 Mon Sep 17 00:00:00 2001
From: Petr Stodulka <pstodulk@redhat.com>
Date: Wed, 14 Dec 2016 16:30:36 +0100
Subject: [PATCH] Fix CVE-2016-9844 (rhbz#1404283)

Fixes buffer overflow in zipinfo in similar way like fix for
CVE-2014-9913 provided by upstream.
---
 zipinfo.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/zipinfo.c b/zipinfo.c
index c03620e..accca2a 100644
--- a/zipinfo.c
+++ b/zipinfo.c
@@ -1984,7 +1984,19 @@ static int zi_short(__G)   /* return PK-type error code */
         ush  dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3);
         methbuf[3] = dtype[dnum];
     } else if (methnum >= NUM_METHODS) {   /* unknown */
-        sprintf(&methbuf[1], "%03u", G.crec.compression_method);
+        /* 2016-12-05 SMS.
+         * https://launchpad.net/bugs/1643750
+         * Unexpectedly large compression methods overflow
+         * &methbuf[].  Use the old, three-digit decimal format
+         * for values which fit.  Otherwise, sacrifice the "u",
+         * and use four-digit hexadecimal.
+         */
+        if (G.crec.compression_method <= 999) {
+              sprintf( &methbuf[ 1], "%03u", G.crec.compression_method);
+        } else {
+              sprintf( &methbuf[ 0], "%04X", G.crec.compression_method);
+        }
+
     }
 
     for (k = 0;  k < 15;  ++k)
-- 
2.5.5

dd5e7ba'>commit</a><a href='/guix/diff/gnu/system/hurd.scm?id=13a8db7f8bdeb1d493ca6eb9ab66ee032dd5e7ba'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/system/hurd.scm'>
<input type='hidden' name='id' value='13a8db7f8bdeb1d493ca6eb9ab66ee032dd5e7ba'/><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=13a8db7f8bdeb1d493ca6eb9ab66ee032dd5e7ba'>root</a>/<a href='/guix/log/gnu?id=13a8db7f8bdeb1d493ca6eb9ab66ee032dd5e7ba'>gnu</a>/<a href='/guix/log/gnu/system?id=13a8db7f8bdeb1d493ca6eb9ab66ee032dd5e7ba'>system</a>/<a href='/guix/log/gnu/system/hurd.scm?id=13a8db7f8bdeb1d493ca6eb9ab66ee032dd5e7ba'>hurd.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/hurd.scm?id=13a8db7f8bdeb1d493ca6eb9ab66ee032dd5e7ba&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-01-08 23:14:46 +0100'>2024-01-08</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=b973480dc99197cc3026339175e1413d367d01f8'>system: hurd: Use the Shepherd 0.10.x.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2023-09-16 15:35:25 +0200'>2023-09-16</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=41df5c5289c970b40a002a32dcfdcb61ddc5a2f5'>system: hurd: Override locale-libcs harder.</a><span class='msg-avail'>...</span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-09-16 15:35:25 +0200'>2023-09-16</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=bd303443be97c5aa5f8696f6f1ecc5e40b919874'>system: hurd: Add nss-certs to %base-packages/hurd.</a><span class='msg-avail'>...</span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-09-16 15:35:25 +0200'>2023-09-16</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=64929be426f7f5fd17ee718da631aff73c7bbe51'>system: hurd: Add procps to %base-packages/hurd.</a><span class='msg-avail'>...</span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-07-13 19:00:02 +0200'>2023-07-13</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=cefcf0fb04c475c2c016e856f2b60a7c2ecdfcf5'>system: hurd: Add netdde to %base-packages/hurd.</a><span class='msg-avail'>...</span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-06-17 14:38:32 +0200'>2023-06-17</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=ff690faf66d8f37ee6b679fcb7cf37e369624ee3'>gnu: Use target-hurd?, system-hurd? instead of hurd-target?, hurd-system?.</a><span class='msg-avail'>...</span></td><td>Janneke Nieuwenhuizen</td></tr>
<tr><td><span title='2023-03-30 12:44:20 +0200'>2023-03-30</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=fda221c469f8d31cdc22bc5053e6b19017764c62'>system: hurd: Use shepherd-0.8 in the package list.</a><span class='msg-avail'>...</span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2023-03-03 17:55:32 +0100'>2023-03-03</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=6edacf249110ce9e59dc44f330d7f03ecd7c60d8'>services: base: Deprecate 'syslog-service' procedure.</a><span class='msg-avail'>...</span></td><td>Bruno Victal</td></tr>
<tr><td><span title='2022-11-28 11:19:31 +0100'>2022-11-28</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=e3c6575ee93741a43003cd1aa4663151dd90b9f5'>system: hurd: Create more ttys.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-04-08 18:14:35 +0200'>2022-04-08</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=df473496edefbb88eaf2fbff7dda2665eb21b4d1'>system: hurd: Fix bogus 'initrd-modules' field.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2022-03-09 23:38:18 +0100'>2022-03-09</span></td><td><a href='/guix/commit/gnu/system/hurd.scm?id=a208a4e923797dcaf6d63dbf2403714d62de8e5a'>system: hurd: Move the Shepherd before the Hurd in %BASE-PACKAGES/HURD.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>