From a8aa78d2449652f0252d040c5e4970adde24d8ed Mon Sep 17 00:00:00 2001 From: Cristy Date: Wed, 4 Apr 2018 19:13:37 -0400 Subject: [PATCH] https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7380 --- coders/tiff.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/coders/tiff.c b/coders/tiff.c index 9d15ec5e2..589a87a01 100644 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -845,7 +845,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, *ascii; ascii=(char *) NULL; - if ((TIFFGetField(tiff,exif_info[i].tag,&ascii,&sans,&sans) == 1) && + if ((TIFFGetField(tiff,exif_info[i].tag,&ascii,&sans,&sans,&sans) == 1) && (ascii != (char *) NULL) && (*ascii != '\0')) (void) CopyMagickString(value,ascii,MagickPathExtent); break; @@ -858,7 +858,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, shorty; shorty=0; - if (TIFFGetField(tiff,exif_info[i].tag,&shorty,&sans,&sans) == 1) + if (TIFFGetField(tiff,exif_info[i].tag,&shorty,&sans,&sans,&sans) == 1) (void) FormatLocaleString(value,MagickPathExtent,"%d",shorty); } else @@ -873,7 +873,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, shorty_num; tiff_status=TIFFGetField(tiff,exif_info[i].tag,&shorty_num,&shorty, - &sans,&sans); + &sans,&sans,&sans); if (tiff_status == 1) (void) FormatLocaleString(value,MagickPathExtent,"%d", shorty_num != 0 ? shorty[0] : 0); @@ -886,7 +886,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, longy; longy=0; - if (TIFFGetField(tiff,exif_info[i].tag,&longy,&sans,&sans) == 1) + if (TIFFGetField(tiff,exif_info[i].tag,&longy,&sans,&sans,&sans) == 1) (void) FormatLocaleString(value,MagickPathExtent,"%d",longy); break; } @@ -897,7 +897,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, long8y; long8y=0; - if (TIFFGetField(tiff,exif_info[i].tag,&long8y,&sans,&sans) == 1) + if (TIFFGetField(tiff,exif_info[i].tag,&long8y,&sans,&sans,&sans) == 1) (void) FormatLocaleString(value,MagickPathExtent,"%.20g",(double) ((MagickOffsetType) long8y)); break; @@ -911,7 +911,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, floaty; floaty=0.0; - if (TIFFGetField(tiff,exif_info[i].tag,&floaty,&sans,&sans) == 1) + if (TIFFGetField(tiff,exif_info[i].tag,&floaty,&sans,&sans,&sans) == 1) (void) FormatLocaleString(value,MagickPathExtent,"%g",(double) floaty); break; @@ -922,7 +922,7 @@ static void TIFFGetEXIFProperties(TIFF *tiff,Image *image, doubley; doubley=0.0; - if (TIFFGetField(tiff,exif_info[i].tag,&doubley,&sans,&sans) == 1) + if (TIFFGetField(tiff,exif_info[i].tag,&doubley,&sans,&sans,&sans) == 1) (void) FormatLocaleString(value,MagickPathExtent,"%g",doubley); break; } -- 2.40.0