mirror of
https://github.com/termux/termux-packages
synced 2024-06-19 16:27:07 +00:00
unzip: replace crc32 patch from debian
This commit is contained in:
parent
f64c1d8d4e
commit
7b33c22dc8
|
@ -1,22 +1,26 @@
|
|||
--- unzip60/extract.c 2010-04-03 14:41:55 -0500
|
||||
+++ unzip60/extract.c 2014-12-03 15:33:35 -0600
|
||||
@@ -1,5 +1,5 @@
|
||||
From: "Steven M. Schweda" <sms@antinode.info>
|
||||
Subject: Fix CVE-2014-8139: CRC32 verification heap-based overflow
|
||||
Bug-Debian: https://bugs.debian.org/773722
|
||||
|
||||
--- a/extract.c
|
||||
+++ b/extract.c
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
|
||||
+ Copyright (c) 1990-2014 Info-ZIP. All rights reserved.
|
||||
|
||||
See the accompanying file LICENSE, version 2009-Jan-02 or later
|
||||
(the contents of which are also included in unzip.h) for terms of use.
|
||||
@@ -298,6 +298,8 @@
|
||||
@@ -298,6 +298,8 @@
|
||||
#ifndef SFX
|
||||
static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \
|
||||
EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
|
||||
+ static ZCONST char Far TooSmallEFlength[] = "bad extra-field entry:\n \
|
||||
+ static ZCONST char Far TooSmallEBlength[] = "bad extra-field entry:\n \
|
||||
+ EF block length (%u bytes) invalid (< %d)\n";
|
||||
static ZCONST char Far InvalidComprDataEAs[] =
|
||||
" invalid compressed data for EAs\n";
|
||||
# if (defined(WIN32) && defined(NTSD_EAS))
|
||||
@@ -2023,7 +2025,8 @@
|
||||
@@ -2023,7 +2025,8 @@
|
||||
ebID = makeword(ef);
|
||||
ebLen = (unsigned)makeword(ef+EB_LEN);
|
||||
|
||||
|
@ -26,20 +30,24 @@
|
|||
/* Discovered some extra field inconsistency! */
|
||||
if (uO.qflag)
|
||||
Info(slide, 1, ((char *)slide, "%-22s ",
|
||||
@@ -2032,6 +2035,16 @@
|
||||
ebLen, (ef_len - EB_HEADSIZE)));
|
||||
return PK_ERR;
|
||||
}
|
||||
+ else if (ebLen < EB_HEADSIZE)
|
||||
+ {
|
||||
+ /* Extra block length smaller than header length. */
|
||||
+ if (uO.qflag)
|
||||
+ Info(slide, 1, ((char *)slide, "%-22s ",
|
||||
+ FnFilter1(G.filename)));
|
||||
+ Info(slide, 1, ((char *)slide, LoadFarString(TooSmallEFlength),
|
||||
+ ebLen, EB_HEADSIZE));
|
||||
+ return PK_ERR;
|
||||
+ }
|
||||
|
||||
switch (ebID) {
|
||||
case EF_OS2:
|
||||
@@ -2158,11 +2161,19 @@
|
||||
}
|
||||
break;
|
||||
case EF_PKVMS:
|
||||
- if (makelong(ef+EB_HEADSIZE) !=
|
||||
+ if (ebLen < 4)
|
||||
+ {
|
||||
+ Info(slide, 1,
|
||||
+ ((char *)slide, LoadFarString(TooSmallEBlength),
|
||||
+ ebLen, 4));
|
||||
+ }
|
||||
+ else if (makelong(ef+EB_HEADSIZE) !=
|
||||
crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4),
|
||||
(extent)(ebLen-4)))
|
||||
+ {
|
||||
Info(slide, 1, ((char *)slide,
|
||||
LoadFarString(BadCRC_EAs)));
|
||||
+ }
|
||||
break;
|
||||
case EF_PKW32:
|
||||
case EF_PKUNIX:
|
||||
|
|
Loading…
Reference in New Issue
Block a user