Corrected patch.

diff --git a/coders/tiff.c b/coders/tiff.c
index 12f7e688b9e55cb339c2b1118e75e9416cf807d0..485d28910e30505c9b366600bb585b195440c2b9 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1719,18 +1719,19 @@ RestoreMSCWarning
           }
       }
     method=ReadGenericMethod;
+    rows_per_strip=image->columns*image->rows;
     if (TIFFGetField(tiff,TIFFTAG_ROWSPERSTRIP,&rows_per_strip) == 1)
       {
         char
           value[MagickPathExtent];
 
-        if (rows_per_strip > (image->columns*image->rows))
-          ThrowTIFFException(CorruptImageError,"ImproperImageHeader");
         method=ReadStripMethod;
         (void) FormatLocaleString(value,MagickPathExtent,"%u",
           (unsigned int) rows_per_strip);
         (void) SetImageProperty(image,"tiff:rows-per-strip",value,exception);
       }
+    if (rows_per_strip > (image->columns*image->rows))
+      ThrowTIFFException(CorruptImageError,"ImproperImageHeader");
     if ((samples_per_pixel >= 3) && (interlace == PLANARCONFIG_CONTIG))
       if ((image->alpha_trait == UndefinedPixelTrait) ||
           (samples_per_pixel >= 4))