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

2470ba0f353145fea'>commit</a><a href='/guix/diff/gnu/packages/file.scm?id=c135d9747e3d1735ec4cf202470ba0f353145fea'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/file.scm'>
<input type='hidden' name='id' value='c135d9747e3d1735ec4cf202470ba0f353145fea'/><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=c135d9747e3d1735ec4cf202470ba0f353145fea'>root</a>/<a href='/guix/log/gnu?id=c135d9747e3d1735ec4cf202470ba0f353145fea'>gnu</a>/<a href='/guix/log/gnu/packages?id=c135d9747e3d1735ec4cf202470ba0f353145fea'>packages</a>/<a href='/guix/log/gnu/packages/file.scm?id=c135d9747e3d1735ec4cf202470ba0f353145fea'>file.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/packages/file.scm?id=c135d9747e3d1735ec4cf202470ba0f353145fea&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-01-31 10:15:57 +0200'>2023-01-31</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=70b7d19ecf35ec27b169ea1ccc772d4a9ff7df93'>gnu: file: Update to 5.44.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/file.scm (file): Update to 5.44.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2022-11-14 18:44:07 +0200'>2022-11-14</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=f1316ff7bf6d5d69ba7295435803a9e320b62813'>gnu: file: Update to 5.43.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/file.scm (file): Update to 5.43.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2022-06-14 20:58:20 +0300'>2022-06-14</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=04c716afa56de3b8ff2b4e98673ddd4544720914'>gnu: file: Update to 5.42.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/file.scm (file): Update to 5.42.
[source]: Update source URI.
[properties]: Remove field.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2022-01-27 17:01:20 +0200'>2022-01-27</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=6ac6a7e0202e536b42756413d464f98e0c02f5c1'>gnu: file: Update to 5.41.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/file.scm (file): Absorb file-next.
* gnu/packages/commencement.scm (file-boot0)[arguments]: Add make-flag
to set CFLAGS.
* gnu/packages/diffoscope.scm (diffoscope): Remove file-next.
* gnu/packages/python-xyz.scm (python-magic)[inputs]: Replace file-next
with file.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-12-16 22:21:13 +0100'>2021-12-16</span></td><td><a href='/guix/commit/gnu/packages/file.scm?id=12c75628b4322853943ae0d0a833e371c02b97f4'>gnu: file: Add 5.41.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/file.scm (file-next): New variable.
</span></span></td><td>Marius Bakke</td></tr>