summarylogtreecommitdiffstats
path: root/cve20149636.patch
diff options
context:
space:
mode:
authorNatrio2015-11-04 18:11:28 +0300
committerNatrio2015-11-04 18:11:28 +0300
commit11d6e3741e26621265bd0371dbc937e7246f181e (patch)
treefeab542163aafe65e88f2ab82ad2a72438bbebfc /cve20149636.patch
parent584df57b04e692adf657ae781ac11d28a193c7de (diff)
downloadaur-unzip-natspec.tar.gz
Update to 6.0-6 (sync patches to unzip 6.0-11)
Diffstat (limited to 'cve20149636.patch')
-rw-r--r--cve20149636.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/cve20149636.patch b/cve20149636.patch
new file mode 100644
index 00000000000..228c28377ff
--- /dev/null
+++ b/cve20149636.patch
@@ -0,0 +1,25 @@
+diff --git a/extract.c b/extract.c
+index a0a4929..9ef80b3 100644
+--- a/extract.c
++++ b/extract.c
+@@ -2214,6 +2214,7 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
+ ulg eb_ucsize;
+ uch *eb_ucptr;
+ int r;
++ ush method;
+
+ if (compr_offset < 4) /* field is not compressed: */
+ return PK_OK; /* do nothing and signal OK */
+@@ -2223,6 +2224,12 @@ static int test_compr_eb(__G__ eb, eb_size, compr_offset, test_uc_ebdata)
+ eb_size <= (compr_offset + EB_CMPRHEADLEN)))
+ return IZ_EF_TRUNC; /* no compressed data! */
+
++ method = makeword(eb + (EB_HEADSIZE + compr_offset));
++ if ((method == STORED) && (eb_size != compr_offset + EB_CMPRHEADLEN + eb_ucsize))
++ return PK_ERR; /* compressed & uncompressed
++ * should match in STORED
++ * method */
++
+ if (
+ #ifdef INT_16BIT
+ (((ulg)(extent)eb_ucsize) != eb_ucsize) ||