1From 7e0435546230ecebe3bfe1ac27eb0186c702c509 Mon Sep 17 00:00:00 2001
 2From: "Steven M. Schweda" <sms@antinode.info>
 3Date: Sat, 15 Jun 2019 18:13:11 -0700
 4Subject: [PATCH] Fix CVE-2016-9844, buffer overflow in zipinfo
 5
 6---
 7 zipinfo.c | 13 ++++++++++++-
 8 1 file changed, 12 insertions(+), 1 deletion(-)
 9
10diff --git a/zipinfo.c b/zipinfo.c
11index 5e77018..0be3e5b 100644
12--- a/zipinfo.c
13+++ b/zipinfo.c
14@@ -1921,7 +1921,18 @@ static int zi_short(__G)   /* return PK-type error code */
15         ush  dnum=(ush)((G.crec.general_purpose_bit_flag>>1) & 3);
16         methbuf[3] = dtype[dnum];
17     } else if (methnum >= NUM_METHODS) {   /* unknown */
18-        sprintf(&methbuf[1], "%03u", G.crec.compression_method);
19+        /* 2016-12-05 SMS.
20+         * https://launchpad.net/bugs/1643750
21+         * Unexpectedly large compression methods overflow
22+         * &methbuf[].  Use the old, three-digit decimal format
23+         * for values which fit.  Otherwise, sacrifice the "u",
24+         * and use four-digit hexadecimal.
25+         */
26+        if (G.crec.compression_method <= 999) {
27+            sprintf( &methbuf[ 1], "%03u", G.crec.compression_method);
28+        } else {
29+            sprintf( &methbuf[ 0], "%04X", G.crec.compression_method);
30+        }
31     }
32 
33     for (k = 0;  k < 15;  ++k)
34-- 
352.20.1
36