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

uix/diff/tests/cve.scm?id=d102bd7316bc2f8fe973987eac13975ac429d50f'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/cve.scm'>
<input type='hidden' name='id' value='d102bd7316bc2f8fe973987eac13975ac429d50f'/><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=d102bd7316bc2f8fe973987eac13975ac429d50f'>root</a>/<a href='/guix/log/tests?id=d102bd7316bc2f8fe973987eac13975ac429d50f'>tests</a>/<a href='/guix/log/tests/cve.scm?id=d102bd7316bc2f8fe973987eac13975ac429d50f'>cve.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/tests/cve.scm?id=d102bd7316bc2f8fe973987eac13975ac429d50f&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-10-23 16:40:17 +0200'>2019-10-23</span></td><td><a href='/guix/commit/tests/cve.scm?id=74afaa37d5dec1a9d1b83951529ba69d8947fb07'>cve: Rewrite to read the JSON feed instead of the XML feed.</a><span class='msg-avail'>...<span class='msg-tooltip'>The XML feed was discontinued on Oct. 16th, 2019:

  &lt;https://nvd.nist.gov/General/News/XML-Vulnerability-Feed-Retirement-Phase-3&gt;

* guix/cve.scm (string-&gt;date*): New procedure.
(&lt;cve-item&gt;, &lt;cve&gt;, &lt;cve-reference&gt;): New record types.
(cpe-match-&gt;cve-configuration, configuration-data-&gt;cve-configurations)
(json-&gt;cve-items, version-matches?): New procedures.
(yearly-feed-uri): Change URL to refer to JSON feed.
(cpe-&gt;product-alist, %parse-vulnerability-feed)
(xml-&gt;vulnerabilities): Remove.
(cve-configuration-&gt;package-list, merge-package-lists)
(cve-item-&gt;vulnerability, json-&gt;vulnerabilities): New procedures.
(write-cache): Use 'json-&gt;vulnerabilities' instead of
'xml-&gt;vulnerabilities', and remove 'parameterize'.
(vulnerabilities-&gt;lookup-proc): Use 'version-matches?' when VERSION is
true.
* tests/cve.scm (%sample): Use 'tests/cve-sample.json'.
(%expected-vulnerabilities): Rewrite accordingly.
("json-&gt;cve-items", "cve-item-published-date")
("json-&gt;vulnerabilities"): New tests.
("xml-&gt;vulnerabilities"): Remove.
("vulnerabilities-&gt;lookup-proc"): Adjust to new vulnerabilities.
* tests/cve-sample.json: New file.
* tests/cve-sample.xml: Remove.
* Makefile.am (EXTRA_DIST): Adjust accordingly.
* doc/guix.texi (Invoking guix lint): Update nist.gov URLs.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-10-20 23:26:50 +0200'>2019-10-20</span></td><td><a href='/guix/commit/tests/cve.scm?id=79c03e55e26d88c8d327daced02367abe7f17f91'>tests: Avoid now-deprecated 'make-struct'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* tests/cve.scm (vulnerability): Use 'make-struct/no-tail' instead of
'make-struct', which is deprecated.
* tests/lint.scm ("cve: one vulnerability")
("cve: one patched vulnerability")
("cve: known safe from vulnerability")
("cve: vulnerability fixed in replacement version")
("cve: patched vulnerability in replacement"): Likewise.
</span></span></td><td>Ludovic Courtès</td></tr>