summaryrefslogtreecommitdiff
path: root/libre/unzip/cve20149636.patch
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-03-15 17:25:56 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-03-15 17:25:56 -0300
commit166d14df478c0e5644efc2dca6b0e1f805045bc8 (patch)
treee34ef4d16302c4a30c1471601ba483d4ad63e6a0 /libre/unzip/cve20149636.patch
parent61ef142219290253087df3cac919209afe94f55e (diff)
unzip-6.0-10.parabola1: fix FS#44171 -> https://bugs.archlinux.org/task/44171
Diffstat (limited to 'libre/unzip/cve20149636.patch')
-rw-r--r--libre/unzip/cve20149636.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/libre/unzip/cve20149636.patch b/libre/unzip/cve20149636.patch
new file mode 100644
index 000000000..228c28377
--- /dev/null
+++ b/libre/unzip/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) ||