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

o/doc/guix-manual.fa.po?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>commit</a><a href='/guix/diff/po/doc/guix-manual.fa.po?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/po/doc/guix-manual.fa.po'>
<input type='hidden' name='id' value='43fb84da6749a78d12ac0f13db4cecb435de7903'/><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/commit/?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>root</a>/<a href='/guix/commit/po?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>po</a>/<a href='/guix/commit/po/doc?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>doc</a>/<a href='/guix/commit/po/doc/guix-manual.fa.po?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>guix-manual.fa.po</a></div><div class='content'><div class='cgit-panel'><b>diff options</b><form method='get'><input type='hidden' name='id' value='43fb84da6749a78d12ac0f13db4cecb435de7903'/><table><tr><td colspan='2'/></tr><tr><td class='label'>context:</td><td class='ctrl'><select name='context' onchange='this.form.submit();'><option value='1'>1</option><option value='2'>2</option><option value='3' selected='selected'>3</option><option value='4'>4</option><option value='5'>5</option><option value='6'>6</option><option value='7'>7</option><option value='8'>8</option><option value='9'>9</option><option value='10'>10</option><option value='15'>15</option><option value='20'>20</option><option value='25'>25</option><option value='30'>30</option><option value='35'>35</option><option value='40'>40</option></select></td></tr><tr><td class='label'>space:</td><td class='ctrl'><select name='ignorews' onchange='this.form.submit();'><option value='0' selected='selected'>include</option><option value='1'>ignore</option></select></td></tr><tr><td class='label'>mode:</td><td class='ctrl'><select name='dt' onchange='this.form.submit();'><option value='0' selected='selected'>unified</option><option value='1'>ssdiff</option><option value='2'>stat only</option></select></td></tr><tr><td/><td class='ctrl'><noscript><input type='submit' value='reload'/></noscript></td></tr></table></form></div><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Julien Lepiller &lt;julien@lepiller.eu&gt;</td><td class='right'>2021-04-18 03:52:11 +0200</td></tr>
<tr><th>committer</th><td>Julien Lepiller &lt;julien@lepiller.eu&gt;</td><td class='right'>2021-04-18 13:18:17 +0200</td></tr>
<tr><th>commit</th><td colspan='2' class='oid'><a href='/guix/commit/po/doc/guix-manual.fa.po?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>43fb84da6749a78d12ac0f13db4cecb435de7903</a> (<a href='/guix/patch/po/doc/guix-manual.fa.po?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='oid'><a href='/guix/tree/?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>fdbedb871501f3b50ef62cc353cbef9e64aab64b</a> /<a href='/guix/tree/po/doc/guix-manual.fa.po?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>po/doc/guix-manual.fa.po</a></td></tr>
<tr><th>parent</th><td colspan='2' class='oid'><a href='/guix/commit/po/doc/guix-manual.fa.po?id=25bd0aefe5e04da2e983c08dbc909dac1932edaf'>25bd0aefe5e04da2e983c08dbc909dac1932edaf</a> (<a href='/guix/diff/po/doc/guix-manual.fa.po?id=43fb84da6749a78d12ac0f13db4cecb435de7903&amp;id2=25bd0aefe5e04da2e983c08dbc909dac1932edaf'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='oid'><a href='/guix/snapshot/guix-43fb84da6749a78d12ac0f13db4cecb435de7903.tar.gz'>guix-43fb84da6749a78d12ac0f13db4cecb435de7903.tar.gz</a><br/><a href='/guix/snapshot/guix-43fb84da6749a78d12ac0f13db4cecb435de7903.zip'>guix-43fb84da6749a78d12ac0f13db4cecb435de7903.zip</a><br/></td></tr></table>
<div class='commit-subject'>nls: Add Persian translation.</div><div class='commit-msg'>* po/packages/fa.po: New file.
* po/packages/LINGUAS: Add 'fa'.
* po/doc/guix-cookbook.fa.po: New file.
* po/doc/guix-manual.fa.po: New file.
* po/doc/local.mk (DOC_PO_FILES, DOC_COOKBOOK_PO_FILES): Add them.
* doc/local.mk (info_TEXINFOS): Add them.
</div><div class='diffstat-header'><a href='/guix/diff/?id=43fb84da6749a78d12ac0f13db4cecb435de7903'>Diffstat</a> (limited to 'po/doc/guix-manual.fa.po')</div><table summary='diffstat' class='diffstat'>