diff options
| author | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-02-08 08:50:32 +0000 |
|---|---|---|
| committer | Leonardo Arena <rnalrd@alpinelinux.org> | 2018-02-08 08:50:32 +0000 |
| commit | 3bb6858aff988546af833aadbf73ab5abafc394f (patch) | |
| tree | 7f2f0aa8f9d8f93a62e2f8c5362ef1f3136e835a /main/tiff | |
| parent | 41746374e80e62b81d78f1a5fb5e5ba62e7f8aa7 (diff) | |
| download | aports-3bb6858aff988546af833aadbf73ab5abafc394f.tar.bz2 aports-3bb6858aff988546af833aadbf73ab5abafc394f.tar.xz | |
main/tiff: security fix CVE-2017-18013
Fixes #8460
Diffstat (limited to 'main/tiff')
| -rw-r--r-- | main/tiff/APKBUILD | 8 | ||||
| -rw-r--r-- | main/tiff/CVE-2017-18013.patch | 34 |
2 files changed, 40 insertions, 2 deletions
diff --git a/main/tiff/APKBUILD b/main/tiff/APKBUILD index fbe79d1cf5..dca070cfd9 100644 --- a/main/tiff/APKBUILD +++ b/main/tiff/APKBUILD @@ -3,7 +3,7 @@ # Maintainer: Michael Mason <ms13sp@gmail.com> pkgname=tiff pkgver=4.0.9 -pkgrel=0 +pkgrel=1 pkgdesc="Provides support for the Tag Image File Format or TIFF" url="http://www.libtiff.org/" arch="all" @@ -14,8 +14,11 @@ makedepends="libtool autoconf automake $depends_dev" subpackages="$pkgname-doc $pkgname-dev $pkgname-tools" builddir="$srcdir/$pkgname-$pkgver" source="http://download.osgeo.org/libtiff/$pkgname-$pkgver.tar.gz + CVE-2017-18013.patch " # secfixes: +# 4.0.9-r1: +# - CVE-2017-18013 # 4.0.9-r0: # - CVE-2017-16231 # - CVE-2017-16232 @@ -69,4 +72,5 @@ tools() { mv "$pkgdir"/usr/bin "$subpkgdir"/usr/ } -sha512sums="04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd tiff-4.0.9.tar.gz" +sha512sums="04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd tiff-4.0.9.tar.gz +2baa66963302ff51e34774d6e0703f769ba1ca7f527456ae13ea230af69280e024440390df9b5a51776fc29cb6d2d40713431a2c2d98f29e50e3f8f5a7f4d73b CVE-2017-18013.patch" diff --git a/main/tiff/CVE-2017-18013.patch b/main/tiff/CVE-2017-18013.patch new file mode 100644 index 0000000000..5a1d90082a --- /dev/null +++ b/main/tiff/CVE-2017-18013.patch @@ -0,0 +1,34 @@ +From c6f41df7b581402dfba3c19a1e3df4454c551a01 Mon Sep 17 00:00:00 2001 +From: Even Rouault <even.rouault@spatialys.com> +Date: Sun, 31 Dec 2017 15:09:41 +0100 +Subject: [PATCH] libtiff/tif_print.c: TIFFPrintDirectory(): fix null pointer dereference on corrupted file. Fixes http://bugzilla.maptools.org/show_bug.cgi?id=2770 + +--- + libtiff/tif_print.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/libtiff/tif_print.c b/libtiff/tif_print.c +index 9959d35..8deceb2 100644 +--- a/libtiff/tif_print.c ++++ b/libtiff/tif_print.c +@@ -665,13 +665,13 @@ TIFFPrintDirectory(TIFF* tif, FILE* fd, long flags) + #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__)) + fprintf(fd, " %3lu: [%8I64u, %8I64u]\n", + (unsigned long) s, +- (unsigned __int64) td->td_stripoffset[s], +- (unsigned __int64) td->td_stripbytecount[s]); ++ td->td_stripoffset ? (unsigned __int64) td->td_stripoffset[s] : 0, ++ td->td_stripbytecount ? (unsigned __int64) td->td_stripbytecount[s] : 0); + #else + fprintf(fd, " %3lu: [%8llu, %8llu]\n", + (unsigned long) s, +- (unsigned long long) td->td_stripoffset[s], +- (unsigned long long) td->td_stripbytecount[s]); ++ td->td_stripoffset ? (unsigned long long) td->td_stripoffset[s] : 0, ++ td->td_stripbytecount ? (unsigned long long) td->td_stripbytecount[s] : 0); + #endif + } + } +-- +libgit2 0.26.0 + |