0011-unzip-6.0-cve-2014-8140.patch (1311B)
1 diff --git a/extract.c b/extract.c 2 index c741b5f..e4a4c7b 100644 3 --- a/extract.c 4 +++ b/extract.c 5 @@ -2240,10 +2240,17 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) 6 if (compr_offset < 4) /* field is not compressed: */ 7 return PK_OK; /* do nothing and signal OK */ 8 9 + /* Return no/bad-data error status if any problem is found: 10 + * 1. eb_size is too small to hold the uncompressed size 11 + * (eb_ucsize). (Else extract eb_ucsize.) 12 + * 2. eb_ucsize is zero (invalid). 2014-12-04 SMS. 13 + * 3. eb_ucsize is positive, but eb_size is too small to hold 14 + * the compressed data header. 15 + */ 16 if ((eb_size < (EB_UCSIZE_P + 4)) || 17 - ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L && 18 - eb_size <= (compr_offset + EB_CMPRHEADLEN))) 19 - return IZ_EF_TRUNC; /* no compressed data! */ 20 + ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) || 21 + ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) 22 + return IZ_EF_TRUNC; /* no/bad compressed data! */ 23 24 method = makeword(eb + (EB_HEADSIZE + compr_offset)); 25 if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))