forked from pool/unzip
Accepting request 643125 from Archiving
OBS-URL: https://build.opensuse.org/request/show/643125 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/unzip?expand=0&rev=44
This commit is contained in:
commit
99e1e39ee3
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 11 14:49:01 UTC 2018 - kstreitova@suse.com
|
||||
|
||||
- Add unzip60-cfactorstr_overflow.patch to fix buffer overflow in
|
||||
list.c [bsc#1110194]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 27 11:39:10 UTC 2018 - kstreitova@suse.com
|
||||
|
||||
|
@ -59,6 +59,7 @@ Patch18: CVE-2014-9913.patch
|
||||
Patch19: CVE-2018-1000035.patch
|
||||
Patch20: Fix-CVE-2014-9636-unzip-buffer-overflow.patch
|
||||
Patch21: unzip60-total_disks_zero.patch
|
||||
Patch22: unzip60-cfactorstr_overflow.patch
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun): update-alternatives
|
||||
Recommends: %{_name}-doc
|
||||
@ -104,6 +105,7 @@ functionality. This version can also extract encrypted archives.
|
||||
%patch19 -p0
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
%patch22 -p1
|
||||
|
||||
%build
|
||||
export RPM_OPT_FLAGS="%{optflags} \
|
||||
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 11 14:49:01 UTC 2018 - kstreitova@suse.com
|
||||
|
||||
- Add unzip60-cfactorstr_overflow.patch to fix buffer overflow in
|
||||
list.c [bsc#1110194] [CVE-2018-18384]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jun 27 11:39:10 UTC 2018 - kstreitova@suse.com
|
||||
|
||||
|
@ -59,6 +59,7 @@ Patch18: CVE-2014-9913.patch
|
||||
Patch19: CVE-2018-1000035.patch
|
||||
Patch20: Fix-CVE-2014-9636-unzip-buffer-overflow.patch
|
||||
Patch21: unzip60-total_disks_zero.patch
|
||||
Patch22: unzip60-cfactorstr_overflow.patch
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun): update-alternatives
|
||||
Recommends: %{_name}-doc
|
||||
@ -104,6 +105,7 @@ functionality. This version can also extract encrypted archives.
|
||||
%patch19 -p0
|
||||
%patch20 -p1
|
||||
%patch21 -p1
|
||||
%patch22 -p1
|
||||
|
||||
%build
|
||||
export RPM_OPT_FLAGS="%{optflags} \
|
||||
|
35
unzip60-cfactorstr_overflow.patch
Normal file
35
unzip60-cfactorstr_overflow.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"),
|
Loading…
Reference in New Issue
Block a user