Blame SOURCES/unzip-6.0-cve-2014-9636.patch

5c40ff
diff --git a/extract.c b/extract.c
5c40ff
index a0a4929..9ef80b3 100644
5c40ff
--- a/extract.c
5c40ff
+++ b/extract.c
5c40ff
@@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
5c40ff
     ulg eb_ucsize;
5c40ff
     uch *eb_ucptr;
5c40ff
     int r;
5c40ff
+    ush method;
5c40ff
 
5c40ff
     if (compr_offset < 4)                /* field is not compressed: */
5c40ff
         return PK_OK;                    /* do nothing and signal OK */
5c40ff
@@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
5c40ff
          eb_size <= (compr_offset + EB_CMPRHEADLEN)))
5c40ff
         return IZ_EF_TRUNC;               /* no compressed data! */
5c40ff
 
5c40ff
+    method = makeword(eb + (EB_HEADSIZE + compr_offset));
5c40ff
+    if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))
5c40ff
+        return PK_ERR;            /* compressed & uncompressed
5c40ff
+                                   * should match in STORED
5c40ff
+                                   * method */
5c40ff
+
5c40ff
     if (
5c40ff
 #ifdef INT_16BIT
5c40ff
         (((ulg)(extent)eb_ucsize) != eb_ucsize) ||