3a6d849f81
OBS-URL: https://build.opensuse.org/request/show/457352 OBS-URL: https://build.opensuse.org/package/show/Archiving/unzip?expand=0&rev=39
25 lines
950 B
Diff
25 lines
950 B
Diff
Index: unzip60/zipinfo.c
|
|
===================================================================
|
|
--- unzip60.orig/zipinfo.c
|
|
+++ unzip60/zipinfo.c
|
|
@@ -1927,7 +1927,18 @@ static int zi_short(__G) /* return PK-
|
|
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 CVE-2016-9844.
|
|
+ * 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)
|