lib32-libtiff: patch

This commit is contained in:
Chaoting Liu 2016-04-24 06:03:30 +01:00
parent 16175917ed
commit 865f480e33
2 changed files with 21 additions and 3 deletions

View File

@ -1,7 +1,7 @@
_pkgbasename=libtiff
pkgname=lib32-$_pkgbasename
pkgver=4.0.6
pkgrel=1
pkgrel=2
pkgdesc="Library for manipulation of TIFF images (32-bit)"
arch=('x86_64')
url="http://www.remotesensing.org/libtiff/"
@ -9,8 +9,15 @@ license=('custom')
depends=('lib32-libjpeg-turbo' 'lib32-zlib' $_pkgbasename=$pkgver)
makedepends=('lib32-libgl' 'lib32-libxmu' 'lib32-libxi' gcc-multilib)
options=('!libtool')
source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz)
md5sums=('d1d2e940dea0b5ad435f21f03d96dd72')
source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz
tiff-4.0.6-buffer-overflow.patch)
md5sums=('d1d2e940dea0b5ad435f21f03d96dd72'
'cdf40bed7ca47252cc7104a17ac0b4da')
prepare() {
cd tiff-${pkgver}
patch -Np1 -i ${srcdir}/tiff-4.0.6-buffer-overflow.patch
}
build() {
export CC="gcc -m32"

View File

@ -0,0 +1,11 @@
--- tiff-4.0.6/tools/gif2tiff.c 2016-04-06 15:43:01.586048341 +0200
+++ tiff-4.0.6/tools/gif2tiff.c 2016-04-06 15:48:05.523207710 +0200
@@ -349,7 +349,7 @@
int status = 1;
(void) getc(infile);
- while ((count = getc(infile)) && count <= 255)
+ while ((count = getc(infile)) && count >= 0 && count <= 255)
if (fread(buf, 1, count, infile) != (size_t) count) {
fprintf(stderr, "short read from file %s (%s)\n",
filename, strerror(errno));