Mercurial > vanilla

annotate compression/unzip/CVE-2014-8139.patch @ 452:8c4366128400

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compression/unzip: initial import, closes #1553
author David Demelier <markand@malikania.fr>
date Sat, 06 Apr 2019 08:13:23 +0200
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
452
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 --- a/extract.c
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 +++ b/extract.c
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 @@ -1,5 +1,5 @@
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 /*
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
5 - Copyright (c) 1990-2009 Info-ZIP. All rights reserved.
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 + Copyright (c) 1990-2014 Info-ZIP. All rights reserved.
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
7
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 See the accompanying file LICENSE, version 2009-Jan-02 or later
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
9 (the contents of which are also included in unzip.h) for terms of use.
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 @@ -298,6 +298,8 @@
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 #ifndef SFX
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 static ZCONST char Far InconsistEFlength[] = "bad extra-field entry:\n \
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
13 EF block length (%u bytes) exceeds remaining EF data (%u bytes)\n";
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 + static ZCONST char Far TooSmallEBlength[] = "bad extra-field entry:\n \
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 + EF block length (%u bytes) invalid (< %d)\n";
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
16 static ZCONST char Far InvalidComprDataEAs[] =
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
17 " invalid compressed data for EAs\n";
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
18 # if (defined(WIN32) && defined(NTSD_EAS))
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
19 @@ -2032,7 +2034,8 @@
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
20 ebID = makeword(ef);
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
21 ebLen = (unsigned)makeword(ef+EB_LEN);
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
22
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
23 - if (ebLen > (ef_len - EB_HEADSIZE)) {
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
24 + if (ebLen > (ef_len - EB_HEADSIZE))
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
25 + {
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
26 /* Discovered some extra field inconsistency! */
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
27 if (uO.qflag)
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
28 Info(slide, 1, ((char *)slide, "%-22s ",
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
29 @@ -2167,11 +2170,29 @@
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
30 }
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
31 break;
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
32 case EF_PKVMS:
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
33 - if (makelong(ef+EB_HEADSIZE) !=
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
34 - crc32(CRCVAL_INITIAL, ef+(EB_HEADSIZE+4),
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
35 - (extent)(ebLen-4)))
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
36 - Info(slide, 1, ((char *)slide,
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
37 - LoadFarString(BadCRC_EAs)));
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
38 + /* 2015-01-30 SMS. Added sufficient-bytes test/message
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
39 + * here. (Removed defective ebLen test above.)
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
40 + *
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
41 + * If sufficient bytes (EB_PKVMS_MINLEN) are available,
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
42 + * then compare the stored CRC value with the calculated
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
43 + * CRC for the remainder of the data (and complain about
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
44 + * a mismatch).
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
45 + */
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
46 + if (ebLen < EB_PKVMS_MINLEN)
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
47 + {
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
48 + /* Insufficient bytes available. */
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
49 + Info( slide, 1,
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
50 + ((char *)slide, LoadFarString( TooSmallEBlength),
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
51 + ebLen, EB_PKVMS_MINLEN));
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
52 + }
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
53 + else if (makelong(ef+ EB_HEADSIZE) !=
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
54 + crc32(CRCVAL_INITIAL,
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
55 + (ef+ EB_HEADSIZE+ EB_PKVMS_MINLEN),
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
56 + (extent)(ebLen- EB_PKVMS_MINLEN)))
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
57 + {
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
58 + Info(slide, 1, ((char *)slide,
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
59 + LoadFarString(BadCRC_EAs)));
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
60 + }
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
61 break;
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
62 case EF_PKW32:
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
63 case EF_PKUNIX:
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
64 --- a/unzpriv.h
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
65 +++ b/unzpriv.h
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
66 @@ -1806,6 +1806,8 @@
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
67 #define EB_NTSD_VERSION 4 /* offset of NTSD version byte */
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
68 #define EB_NTSD_MAX_VER (0) /* maximum version # we know how to handle */
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
69
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
70 +#define EB_PKVMS_MINLEN 4 /* minimum data length of PKVMS extra block */
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
71 +
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
72 #define EB_ASI_CRC32 0 /* offset of ASI Unix field's crc32 checksum */
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
73 #define EB_ASI_MODE 4 /* offset of ASI Unix permission mode field */
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
74
8c4366128400 compression/unzip: initial import, closes #1553
David Demelier <markand@malikania.fr>
parents:
diff changeset
75