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

fc49171027b3baabab9c6fdb93dd422c'>commit</a><a href='/guix/diff/gnu/packages/android.scm?id=6d13c785fc49171027b3baabab9c6fdb93dd422c'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/android.scm'>
<input type='hidden' name='id' value='6d13c785fc49171027b3baabab9c6fdb93dd422c'/><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=6d13c785fc49171027b3baabab9c6fdb93dd422c'>root</a>/<a href='/guix/log/gnu?id=6d13c785fc49171027b3baabab9c6fdb93dd422c'>gnu</a>/<a href='/guix/log/gnu/packages?id=6d13c785fc49171027b3baabab9c6fdb93dd422c'>packages</a>/<a href='/guix/log/gnu/packages/android.scm?id=6d13c785fc49171027b3baabab9c6fdb93dd422c'>android.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/android.scm?id=6d13c785fc49171027b3baabab9c6fdb93dd422c&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-12-13 20:18:25 +0000'>2024-12-13</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=6d97c15911a51d29f91e3656f9c4ab38e08d7f21'>gnu: Add python-setuptools/python-wheel where necessary.</a><span class='msg-avail'>...<span class='msg-tooltip'>Changes to pyproject-build-system require explicit dependency on
setuptools/wheel.

Change-Id: Icd7699fc1dc56e974ae7568f2ae916dbf876bea5
</span></span></td><td>Lars-Dominik Braun</td></tr>
<tr><td><span title='2024-08-31 10:44:56 +0200'>2024-08-31</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=9236bc7b71dee5f0b2e2d22755403ffb2cdaa728'>gnu: android-libselinux: Fix inexistant phase name.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/android.scm (android-libselinux): Fix inexistant phase name.

Change-Id: Ia0afb0d4ef9cf05300366db3a5d5c0e6657450f4
</span></span></td><td>Josselin Poiret</td></tr>
<tr><td><span title='2024-04-04 17:16:57 +0100'>2024-04-04</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=8a3a91117c080668288db6a5660f52ab4d87b783'>gnu: go-github-com-schollz-progressbar-v3: Move to golang-xyz.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/golang.scm (go-github-com-schollz-progressbar-v3): Move
from here ...
* gnu/packages/golang-xyz.scm: ... to here.

* gnu/packages/android.scm: Add (gnu packages golang-xyz) module.

Change-Id: Id40397b4f3323670847d8e46f5d8fc6ffea61c84
</span></span></td><td>Sharlatan Hellseher</td></tr>
<tr><td><span title='2024-02-18 15:56:05 +0100'>2024-02-18</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=e47d3c6f945108b42d4ba0950f4076c07f246c45'>gnu: Add emacs-fdroid.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/android.scm (emacs-fdroid): New variable.

Change-Id: I68358b5490406aa6ee24391bee6e69bebc574d96
Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Miguel Ángel Moreno</td></tr>
<tr><td><span title='2024-02-14 15:57:45 -0500'>2024-02-14</span></td><td><a href='/guix/commit/gnu/packages/android.scm?id=7577de9355e47989c1ae6cb48ef1eec1674985fd'>gnu: android-file-transfer: Update to 4.3.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/android.scm (android-file-transfer): Update to 4.3.

Change-Id: I011229903be725958d3b0c018cfa7a7afef3eacd
Signed-off-by: John Kehayias &lt;john.kehayias@protonmail.com&gt;
</span></span></td><td>kiasoc5</td></tr>