diff options
| author | freaj <freaj@riseup.net> | 2015-03-17 08:39:50 +0100 |
|---|---|---|
| committer | freaj <freaj@riseup.net> | 2015-03-17 08:39:50 +0100 |
| commit | 5c2f3e3963bc955563bc53f882d76da2e37fa01c (patch) | |
| tree | 0de6dceb92a1d1b7b7e389506b2524c15b9abfd6 /libre/unzip/cve20149636.patch | |
| parent | 87e90fe1d4913ffad0c4046e8ff9ec899db20e11 (diff) | |
| parent | 53c554ed87485a3fac0b8a73dba70f5b0e06218e (diff) | |
Merge branch 'master' of git://projects.parabola.nu/abslibre/abslibre
Diffstat (limited to 'libre/unzip/cve20149636.patch')
| -rw-r--r-- | libre/unzip/cve20149636.patch | 25 |
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) || |