summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2019-06-29 16:54:50 +0000
committerEven Rouault <even.rouault@spatialys.com>2019-06-29 16:54:50 +0000
commitab3204b16733d9afc23cfdf66bf54fb6c80d62ce (patch)
tree8b1ef2f259c0ea84346162c9811ee856aef4a763
parent424972255f89a3bedf29e05d0bce7b5fe7075da1 (diff)
parentb381187db693545558fd24ffd1bac53665620392 (diff)
downloadlibtiff-git-ab3204b16733d9afc23cfdf66bf54fb6c80d62ce.tar.gz
Merge branch 'fix-division-by-zero' into 'master'
Return infinite distance when denominator is zero. See merge request libtiff/libtiff!85
-rw-r--r--libtiff/tif_dirread.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
index 214396b1..1b300b09 100644
--- a/libtiff/tif_dirread.c
+++ b/libtiff/tif_dirread.c
@@ -5717,7 +5717,7 @@ TIFFFetchSubjectDistance(TIFF* tif, TIFFDirEntry* dir)
TIFFSwabArrayOfLong(m.i,2);
if (m.i[0]==0)
n=0.0;
- else if (m.i[0]==0xFFFFFFFF)
+ else if (m.i[0]==0xFFFFFFFF || m.i[1]==0)
/*
* XXX: Numerator 0xFFFFFFFF means that we have infinite
* distance. Indicate that with a negative floating point