fix unsigned overflow patch for #1260944

Resolves: #1281804
This commit is contained in:
Petr Stodulka 2015-11-13 14:56:24 +01:00
parent d599e36567
commit 36af2c8ca9
2 changed files with 5 additions and 2 deletions

View File

@ -86,7 +86,7 @@ index 29db027..b9ae667 100644
- if (G.pInfo->encrypted) - if (G.pInfo->encrypted)
+ if (G.pInfo->encrypted) { + if (G.pInfo->encrypted) {
+ if (csiz_decrypted <= 12) { + if (csiz_decrypted < 12) {
+ /* handle the error now to prevent unsigned overflow */ + /* handle the error now to prevent unsigned overflow */
+ Info(slide, 0x401, ((char *)slide, + Info(slide, 0x401, ((char *)slide,
+ LoadFarStringSmall(ErrUnzipNoFile), + LoadFarStringSmall(ErrUnzipNoFile),

View File

@ -1,7 +1,7 @@
Summary: A utility for unpacking zip files Summary: A utility for unpacking zip files
Name: unzip Name: unzip
Version: 6.0 Version: 6.0
Release: 25%{?dist} Release: 26%{?dist}
License: BSD License: BSD
Group: Applications/Archiving Group: Applications/Archiving
Source: http://downloads.sourceforge.net/infozip/unzip60.tar.gz Source: http://downloads.sourceforge.net/infozip/unzip60.tar.gz
@ -95,6 +95,9 @@ make -f unix/Makefile prefix=$RPM_BUILD_ROOT%{_prefix} MANDIR=$RPM_BUILD_ROOT/%{
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Fri Nov 13 2015 Petr Stodulka <pstodulk@redhat.com> - 6.0-26
- fix unsigned overflow patch for #1260944 (#1281804)
* Thu Oct 29 2015 Petr Stodulka <pstodulk@redhat.com> - 6.0-25 * Thu Oct 29 2015 Petr Stodulka <pstodulk@redhat.com> - 6.0-25
- add support of non-latin and non-unicode encodings for filenames (#885540) - add support of non-latin and non-unicode encodings for filenames (#885540)