aboutsummaryrefslogtreecommitdiffstats
path: root/main/tiff/CVE-2017-7598.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2017-11-23 07:38:08 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2017-11-23 08:47:22 +0100
commit17f5b0b8cb4daab681a3b9c2aca7d363aaa53641 (patch)
treee137c9ebfa0e402ee321c546b03fdb657a2f9ce1 /main/tiff/CVE-2017-7598.patch
parent336cc11a149e0b1e44bf74c1ba3fa8aa340a828f (diff)
downloadaports-17f5b0b8cb4daab681a3b9c2aca7d363aaa53641.tar.bz2
aports-17f5b0b8cb4daab681a3b9c2aca7d363aaa53641.tar.xz
main/tiff: security upgrade to 4.0.9 (CVE-2017-16231,CVE-2017-16232)
fixes #8149
Diffstat (limited to 'main/tiff/CVE-2017-7598.patch')
-rw-r--r--main/tiff/CVE-2017-7598.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/main/tiff/CVE-2017-7598.patch b/main/tiff/CVE-2017-7598.patch
deleted file mode 100644
index 4e6a04f42c..0000000000
--- a/main/tiff/CVE-2017-7598.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 3cfd62d77c2a7e147a05bd678524c345fa9c2bb8 Mon Sep 17 00:00:00 2001
-From: erouault <erouault>
-Date: Wed, 11 Jan 2017 13:28:01 +0000
-Subject: [PATCH] * libtiff/tif_dirread.c: avoid division by floating point 0
- in TIFFReadDirEntryCheckedRational() and TIFFReadDirEntryCheckedSrational(),
- and return 0 in that case (instead of infinity as before presumably)
- Apparently some sanitizers do not like those divisions by zero. Fixes
- http://bugzilla.maptools.org/show_bug.cgi?id=2644
-
----
- libtiff/tif_dirread.c | 10 ++++++++--
- 2 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
-index 570d0c3..8a1e42a 100644
---- a/libtiff/tif_dirread.c
-+++ b/libtiff/tif_dirread.c
-@@ -2872,7 +2872,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedRational(TIFF* tif, TIFFD
- m.l = direntry->tdir_offset.toff_long8;
- if (tif->tif_flags&TIFF_SWAB)
- TIFFSwabArrayOfLong(m.i,2);
-- if (m.i[0]==0)
-+ /* Not completely sure what we should do when m.i[1]==0, but some */
-+ /* sanitizers do not like division by 0.0: */
-+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */
-+ if (m.i[0]==0 || m.i[1]==0)
- *value=0.0;
- else
- *value=(double)m.i[0]/(double)m.i[1];
-@@ -2900,7 +2903,10 @@ static enum TIFFReadDirEntryErr TIFFReadDirEntryCheckedSrational(TIFF* tif, TIFF
- m.l=direntry->tdir_offset.toff_long8;
- if (tif->tif_flags&TIFF_SWAB)
- TIFFSwabArrayOfLong(m.i,2);
-- if ((int32)m.i[0]==0)
-+ /* Not completely sure what we should do when m.i[1]==0, but some */
-+ /* sanitizers do not like division by 0.0: */
-+ /* http://bugzilla.maptools.org/show_bug.cgi?id=2644 */
-+ if ((int32)m.i[0]==0 || m.i[1]==0)
- *value=0.0;
- else
- *value=(double)((int32)m.i[0])/(double)m.i[1];