1From e56d66a033b533f26872a20cb2052473962a0f2e Mon Sep 17 00:00:00 2001 2From: 4ugustus <wangdw.augustus@qq.com> 3Date: Tue, 8 Mar 2022 16:22:04 +0000 4Subject: [PATCH] fix the FPE in tiffcrop (#393) 5 6CVE: CVE-2022-0909 7Upstream-Status: Backport 8Signed-off-by: Ross Burton <ross.burton@arm.com> 9 10--- 11 libtiff/tif_dir.c | 4 ++-- 12 1 file changed, 2 insertions(+), 2 deletions(-) 13 14diff --git a/libtiff/tif_dir.c b/libtiff/tif_dir.c 15index a6c254f..77da6ea 100644 16--- a/libtiff/tif_dir.c 17+++ b/libtiff/tif_dir.c 18@@ -335,13 +335,13 @@ _TIFFVSetField(TIFF* tif, uint32_t tag, va_list ap) 19 break; 20 case TIFFTAG_XRESOLUTION: 21 dblval = va_arg(ap, double); 22- if( dblval < 0 ) 23+ if( dblval != dblval || dblval < 0 ) 24 goto badvaluedouble; 25 td->td_xresolution = _TIFFClampDoubleToFloat( dblval ); 26 break; 27 case TIFFTAG_YRESOLUTION: 28 dblval = va_arg(ap, double); 29- if( dblval < 0 ) 30+ if( dblval != dblval || dblval < 0 ) 31 goto badvaluedouble; 32 td->td_yresolution = _TIFFClampDoubleToFloat( dblval ); 33 break; 34