mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 23:46:13 -05:00
31d289a475
Non-exhaustively fixes CVE-2016-9844, CVE-2018-1000035, CVE-2018-18384, and CVE-2019-13232. * gnu/packages/patches/unzip-COVSCAN-fix-unterminated-string.patch, gnu/packages/patches/unzip-CVE-2016-9844.patch, gnu/packages/patches/unzip-CVE-2018-1000035.patch, gnu/packages/patches/unzip-CVE-2018-18384.patch, gnu/packages/patches/unzip-case-insensitive.patch, gnu/packages/patches/unzip-alt-iconv-utf8-print.patch, gnu/packages/patches/unzip-alt-iconv-utf8.patch, gnu/packages/patches/unzip-close.patch, gnu/packages/patches/unzip-exec-shield.patch, gnu/packages/patches/unzip-fix-recmatch.patch, gnu/packages/patches/unzip-manpage-fix.patch, gnu/packages/patches/unzip-overflow.patch, gnu/packages/patches/unzip-symlink.patch, gnu/packages/patches/unzip-timestamp.patch, gnu/packages/patches/unzip-valgrind.patch, gnu/packages/patches/unzip-x-option.patch, gnu/packages/patches/unzip-zipbomb-manpage.patch, gnu/packages/patches/unzip-zipbomb-part1.patch, gnu/packages/patches/unzip-zipbomb-part2.patch, gnu/packages/patches/unzip-zipbomb-part3.patch: New patches. * gnu/local.mk (dist_patch_DATA): Register them. * gnu/packages/compression.scm (unzip/fixed): New variable. Apply patches. (unzip)[replacement]: Graft.
35 lines
1.6 KiB
Diff
35 lines
1.6 KiB
Diff
--- 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[13];
|
|
+ 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"),
|