unzip: patch CVE-2018-18384
Patch from https://sourceforge.net/p/infozip/bugs/53/
This commit is contained in:
parent
27ed56ce1d
commit
705167a5dc
35
pkgs/tools/archivers/unzip/CVE-2018-18384.patch
Normal file
35
pkgs/tools/archivers/unzip/CVE-2018-18384.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
--- unzip60/list.c
|
||||||
|
+++ unzip60/list.c
|
||||||
|
@@ -97,7 +97,7 @@ int list_files(__G) /* return PK-type
|
||||||
|
{
|
||||||
|
int do_this_file=FALSE, cfactor, error, error_in_archive=PK_COOL;
|
||||||
|
#ifndef WINDLL
|
||||||
|
- char sgn, cfactorstr[10];
|
||||||
|
+ char sgn, cfactorstr[1+10+1+1]; /* <sgn><int>%NUL */
|
||||||
|
int longhdr=(uO.vflag>1);
|
||||||
|
#endif
|
||||||
|
int date_format;
|
||||||
|
@@ -389,9 +389,9 @@ int list_files(__G) /* return PK-type
|
||||||
|
}
|
||||||
|
#else /* !WINDLL */
|
||||||
|
if (cfactor == 100)
|
||||||
|
- sprintf(cfactorstr, LoadFarString(CompFactor100));
|
||||||
|
+ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100));
|
||||||
|
else
|
||||||
|
- sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor);
|
||||||
|
+ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor);
|
||||||
|
if (longhdr)
|
||||||
|
Info(slide, 0, ((char *)slide, LoadFarString(LongHdrStats),
|
||||||
|
FmZofft(G.crec.ucsize, "8", "u"), methbuf,
|
||||||
|
@@ -471,9 +471,9 @@ int list_files(__G) /* return PK-type
|
||||||
|
|
||||||
|
#else /* !WINDLL */
|
||||||
|
if (cfactor == 100)
|
||||||
|
- sprintf(cfactorstr, LoadFarString(CompFactor100));
|
||||||
|
+ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactor100));
|
||||||
|
else
|
||||||
|
- sprintf(cfactorstr, LoadFarString(CompFactorStr), sgn, cfactor);
|
||||||
|
+ snprintf(cfactorstr, sizeof(cfactorstr), LoadFarString(CompFactorStr), sgn, cfactor);
|
||||||
|
if (longhdr) {
|
||||||
|
Info(slide, 0, ((char *)slide, LoadFarString(LongFileTrailer),
|
||||||
|
FmZofft(tot_ucsize, "8", "u"), FmZofft(tot_csize, "8", "u"),
|
@ -24,6 +24,7 @@ stdenv.mkDerivation {
|
|||||||
./CVE-2015-7697.diff
|
./CVE-2015-7697.diff
|
||||||
./CVE-2014-9913.patch
|
./CVE-2014-9913.patch
|
||||||
./CVE-2016-9844.patch
|
./CVE-2016-9844.patch
|
||||||
|
./CVE-2018-18384.patch
|
||||||
./dont-hardcode-cc.patch
|
./dont-hardcode-cc.patch
|
||||||
] ++ stdenv.lib.optional enableNLS
|
] ++ stdenv.lib.optional enableNLS
|
||||||
(fetchurl {
|
(fetchurl {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user