|
 |
32ca9a |
diff --git a/extract.c b/extract.c
|
|
|
32ca9a |
index 9ef80b3..c741b5f 100644
|
|
|
32ca9a |
--- a/extract.c
|
|
|
32ca9a |
+++ b/extract.c
|
|
|
32ca9a |
@@ -1,5 +1,5 @@
|
|
|
32ca9a |
/*
|
|
|
32ca9a |
- Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
|
|
|
32ca9a |
+ Copyright (c) 1990-2014 Info-ZIP. All rights reserved.
|
|
|
32ca9a |
|
|
|
32ca9a |
See the accompanying file LICENSE, version 2009-Jan-02 or later
|
|
|
32ca9a |
(the contents of which are also included in unzip.h) for terms of use.
|
|
|
32ca9a |
@@ -298,6 +298,8 @@ char ZCONST Far TruncNTSD[] =
|
|
|
32ca9a |
#ifndef SFX
|
|
|
32ca9a |
static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \
|
|
|
32ca9a |
EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
|
|
|
32ca9a |
+ static ZCONST char Far TooSmallEBlength[] = "bad extra-field entry:\n \
|
|
|
32ca9a |
+ EF block length (%u bytes) invalid (< %d)\n";
|
|
|
32ca9a |
static ZCONST char Far InvalidComprDataEAs[] =
|
|
|
32ca9a |
" invalid compressed data for EAs\n";
|
|
|
32ca9a |
# if (defined(WIN32) && defined(NTSD_EAS))
|
|
|
32ca9a |
@@ -2020,7 +2022,8 @@ static int TestExtraField(__G__ ef, ef_len)
|
|
|
32ca9a |
ebID = makeword(ef);
|
|
|
32ca9a |
ebLen = (unsigned)makeword(ef+EB_LEN);
|
|
|
32ca9a |
|
|
|
32ca9a |
- if (ebLen > (ef_len - EB_HEADSIZE)) {
|
|
|
32ca9a |
+ if (ebLen > (ef_len - EB_HEADSIZE))
|
|
|
32ca9a |
+ {
|
|
|
32ca9a |
/* Discovered some extra field inconsistency! */
|
|
|
32ca9a |
if (uO.qflag)
|
|
|
32ca9a |
Info(slide, 1, ((char *)slide, "%-22s ",
|
|
|
32ca9a |
@@ -2155,11 +2158,29 @@ static int TestExtraField(__G__ ef, ef_len)
|
|
|
32ca9a |
}
|
|
|
32ca9a |
break;
|
|
|
32ca9a |
case EF_PKVMS:
|
|
|
32ca9a |
- if (makelong(ef+EB_HEADSIZE) !=
|
|
|
32ca9a |
- crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4),
|
|
|
32ca9a |
- (extent)(ebLen-4)))
|
|
|
32ca9a |
- Info(slide, 1, ((char *)slide,
|
|
|
32ca9a |
- LoadFarString(BadCRC_EAs)));
|
|
|
32ca9a |
+ /* 2015-01-30 SMS. Added sufficient-bytes test/message
|
|
|
32ca9a |
+ * here. (Removed defective ebLen test above.)
|
|
|
32ca9a |
+ *
|
|
|
32ca9a |
+ * If sufficient bytes (EB_PKVMS_MINLEN) are available,
|
|
|
32ca9a |
+ * then compare the stored CRC value with the calculated
|
|
|
32ca9a |
+ * CRC for the remainder of the data (and complain about
|
|
|
32ca9a |
+ * a mismatch).
|
|
|
32ca9a |
+ */
|
|
|
32ca9a |
+ if (ebLen < EB_PKVMS_MINLEN)
|
|
|
32ca9a |
+ {
|
|
|
32ca9a |
+ /* Insufficient bytes available. */
|
|
|
32ca9a |
+ Info( slide, 1,
|
|
|
32ca9a |
+ ((char *)slide, LoadFarString( TooSmallEBlength),
|
|
|
32ca9a |
+ ebLen, EB_PKVMS_MINLEN));
|
|
|
32ca9a |
+ }
|
|
|
32ca9a |
+ else if (makelong(ef+ EB_HEADSIZE) !=
|
|
|
32ca9a |
+ crc32(CRCVAL_INITIAL,
|
|
|
32ca9a |
+ (ef+ EB_HEADSIZE+ EB_PKVMS_MINLEN),
|
|
|
32ca9a |
+ (extent)(ebLen- EB_PKVMS_MINLEN)))
|
|
|
32ca9a |
+ {
|
|
|
32ca9a |
+ Info(slide, 1, ((char *)slide,
|
|
|
32ca9a |
+ LoadFarString(BadCRC_EAs)));
|
|
|
32ca9a |
+ }
|
|
|
32ca9a |
break;
|
|
|
32ca9a |
case EF_PKW32:
|
|
|
32ca9a |
case EF_PKUNIX:
|
|
|
32ca9a |
diff --git a/unzpriv.h b/unzpriv.h
|
|
|
32ca9a |
index 005cee0..5c83a6e 100644
|
|
|
32ca9a |
--- a/unzpriv.h
|
|
|
32ca9a |
+++ b/unzpriv.h
|
|
|
32ca9a |
@@ -1806,6 +1806,8 @@
|
|
|
32ca9a |
#define EB_NTSD_VERSION 4 /* offset of NTSD version byte */
|
|
|
32ca9a |
#define EB_NTSD_MAX_VER (0) /* maximum version # we know how to handle */
|
|
|
32ca9a |
|
|
|
32ca9a |
+#define EB_PKVMS_MINLEN 4 /* minimum data length of PKVMS extra block */
|
|
|
32ca9a |
+
|
|
|
32ca9a |
#define EB_ASI_CRC32 0 /* offset of ASI Unix field's crc32 checksum */
|
|
|
32ca9a |
#define EB_ASI_MODE 4 /* offset of ASI Unix permission mode field */
|
|
|
32ca9a |
|
|
|
32ca9a |
|