f6883df
diff --git a/extract.c b/extract.c
f6883df
index c741b5f..e4a4c7b 100644
f6883df
--- a/extract.c
f6883df
+++ b/extract.c
f6883df
@@ -2240,10 +2240,17 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
f6883df
     if (compr_offset < 4)                /* field is not compressed: */
f6883df
         return PK_OK;                    /* do nothing and signal OK */
f6883df
 
f6883df
+    /* Return no/bad-data error status if any problem is found:
f6883df
+     *    1. eb_size is too small to hold the uncompressed size
f6883df
+     *       (eb_ucsize).  (Else extract eb_ucsize.)
f6883df
+     *    2. eb_ucsize is zero (invalid).  2014-12-04 SMS.
f6883df
+     *    3. eb_ucsize is positive, but eb_size is too small to hold
f6883df
+     *       the compressed data header.
f6883df
+     */
f6883df
     if ((eb_size < (EB_UCSIZE_P + 4)) ||
f6883df
-        ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
f6883df
-         eb_size <= (compr_offset + EB_CMPRHEADLEN)))
f6883df
-        return IZ_EF_TRUNC;               /* no compressed data! */
f6883df
+     ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
f6883df
+     ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
f6883df
+        return IZ_EF_TRUNC;             /* no/bad compressed data! */
f6883df
 
f6883df
     method = makeword(eb + (EB_HEADSIZE + compr_offset));
df221ec
     if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))