From 796cae72cf9ed18ba01256ac1f83a686a2a76036 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 20 Nov 2017 18:45:28 +0000 Subject: gentoo resync : 20.11.2017 --- media-libs/tiff/files/tiff-4.0.7-bug2644.patch | 45 -------------------------- 1 file changed, 45 deletions(-) delete mode 100644 media-libs/tiff/files/tiff-4.0.7-bug2644.patch (limited to 'media-libs/tiff/files/tiff-4.0.7-bug2644.patch') diff --git a/media-libs/tiff/files/tiff-4.0.7-bug2644.patch b/media-libs/tiff/files/tiff-4.0.7-bug2644.patch deleted file mode 100644 index b4ec01a32177..000000000000 --- a/media-libs/tiff/files/tiff-4.0.7-bug2644.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 699097af4e22e48fc78ae7ae02807ec37f0d31fe Mon Sep 17 00:00:00 2001 -From: Even Rouault -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 - ---- - ChangeLog | 8 ++++++++ - libtiff/tif_dirread.c | 12 +++++++++--- - 2 files changed, 17 insertions(+), 3 deletions(-) - -diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c -index f2905286c0d0..eae3430612d0 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]; --- -2.12.0 - -- cgit v1.2.3