diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-01-10 23:45:32 -0200 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2015-01-10 23:45:32 -0200 |
| commit | 0bb4e9837efe653fbac32b6a444e6cb58351114c (patch) | |
| tree | 7d613da8ce0569845278a766c80eb570057ee37a /libre/unzip/test_compr_eb.patch | |
| parent | 01849a148f7c2485d7eaf6d5da7077f336e36446 (diff) | |
| download | abslibre-0bb4e9837efe653fbac32b6a444e6cb58351114c.tar.gz abslibre-0bb4e9837efe653fbac32b6a444e6cb58351114c.tar.bz2 abslibre-0bb4e9837efe653fbac32b6a444e6cb58351114c.zip | |
unzip-6.0-9.parabola1: fix FS#43391 -> https://bugs.archlinux.org/task/43391
Diffstat (limited to 'libre/unzip/test_compr_eb.patch')
| -rw-r--r-- | libre/unzip/test_compr_eb.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/libre/unzip/test_compr_eb.patch b/libre/unzip/test_compr_eb.patch new file mode 100644 index 000000000..7e8c2976e --- /dev/null +++ b/libre/unzip/test_compr_eb.patch @@ -0,0 +1,23 @@ +--- extract.c 2009-03-14 02:32:52.000000000 +0100 ++++ extract.c 2014-12-05 22:43:13.000000000 +0100 +@@ -2221,10 +2234,17 @@ static int test_compr_eb(__G__ eb, eb_si + if (compr_offset < 4) /* field is not compressed: */ + return PK_OK; /* do nothing and signal OK */ + ++ /* Return no/bad-data error status if any problem is found: ++ * 1. eb_size is too small to hold the uncompressed size ++ * (eb_ucsize). (Else extract eb_ucsize.) ++ * 2. eb_ucsize is zero (invalid). 2014-12-04 SMS. ++ * 3. eb_ucsize is positive, but eb_size is too small to hold ++ * the compressed data header. ++ */ + if ((eb_size < (EB_UCSIZE_P + 4)) || +- ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L && +- eb_size <= (compr_offset + EB_CMPRHEADLEN))) +- return IZ_EF_TRUNC; /* no compressed data! */ ++ ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) || ++ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN)))) ++ return IZ_EF_TRUNC; /* no/bad compressed data! */ + + if ( + #ifdef INT_16BIT |