[arch-commits] Commit in unzip/trunk (PKGBUILD test_compr_eb.patch)

[Gaetan Bisson]

    Date: Saturday, January 10, 2015 @ 20:27:10
  Author: bisson
Revision: 228890

fix FS#43391

Added:
  unzip/trunk/test_compr_eb.patch
Modified:
  unzip/trunk/PKGBUILD

---------------------+
 PKGBUILD            |    5 ++++-
 test_compr_eb.patch |   23 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-01-10 11:31:02 UTC (rev 228889)
+++ PKGBUILD	2015-01-10 19:27:10 UTC (rev 228890)
@@ -6,7 +6,7 @@
 pkgname=unzip
 pkgver=6.0
 _pkgver=${pkgver/./}
-pkgrel=8
+pkgrel=9
 pkgdesc='For extracting and viewing files in .zip archives'
 url='http://www.info-zip.org/UnZip.html'
 arch=('i686' 'x86_64')
@@ -13,9 +13,11 @@
 license=('custom')
 depends=('bzip2' 'bash')
 source=("http://downloads.sourceforge.net/infozip/${pkgname}${_pkgver}.tar.gz"
+        'test_compr_eb.patch'
         'getZip64Data.patch'
         'crc32.patch')
 sha1sums=('abf7de8a4018a983590ed6f5cbd990d4740f8a22'
+          '614c3e7fa7d6da7c60ea2aa79e36f4cbd17c3824'
           '691d0751bf0bc98cf9f9889dee39baccabefdc4d'
           '82c9fe9172779a0ee92a187d544e74e8f512b013')
 
@@ -22,6 +24,7 @@
 prepare() {
 	cd "${srcdir}/${pkgname}${_pkgver}"
 	sed -i "/MANDIR =/s#)/#)/share/#" unix/Makefile
+	patch -i ../test_compr_eb.patch # FS#43391
 	patch -i ../getZip64Data.patch # FS#43300
 	patch -i ../crc32.patch # FS#43300
 }

Added: test_compr_eb.patch
===================================================================
--- test_compr_eb.patch	                        (rev 0)
+++ test_compr_eb.patch	2015-01-10 19:27:10 UTC (rev 228890)
@@ -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