You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
25 lines
1.3 KiB
25 lines
1.3 KiB
diff --git a/extract.c b/extract.c |
|
index c741b5f..e4a4c7b 100644 |
|
--- a/extract.c |
|
+++ b/extract.c |
|
@@ -2240,10 +2240,17 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata) |
|
if (compr_offset < 4) /* field is not compressed: */ |
|
return PK_OK; /* do nothing and signal OK */ |
|
|
|
+ /* Return no/bad-data error status if any problem is found: |
|
+ * 1. eb_size is too small to hold the uncompressed size |
|
+ * (eb_ucsize). (Else extract eb_ucsize.) |
|
+ * 2. eb_ucsize is zero (invalid). 2014-12-04 SMS. |
|
+ * 3. eb_ucsize is positive, but eb_size is too small to hold |
|
+ * the compressed data header. |
|
+ */ |
|
if ((eb_size < (EB_UCSIZE_P + 4)) || |
|
- ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L && |
|
- eb_size <= (compr_offset + EB_CMPRHEADLEN))) |
|
- return IZ_EF_TRUNC; /* no compressed data! */ |
|
+ ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) || |
|
+ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) |
|
+ return IZ_EF_TRUNC; /* no/bad compressed data! */ |
|
|
|
method = makeword(eb + (EB_HEADSIZE + compr_offset)); |
|
if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))
|
|
|