From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 8 May 2016 00:40:41 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.1-3~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3aab73cffb935d41da6576e7b65b23729d60d375;p=imagemagick

...
---

diff --git a/coders/tiff.c b/coders/tiff.c
index 6335f5ac0..d051e1e66 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1887,9 +1887,6 @@ RestoreMSCWarning
           columns,
           rows;
 
-        size_t
-          number_pixels;
-
         /*
           Convert tiled TIFF image to DirectClass MIFF image.
         */
@@ -1900,9 +1897,15 @@ RestoreMSCWarning
             ThrowReaderException(CoderError,"ImageIsNotTiled");
           }
         (void) SetImageStorageClass(image,DirectClass,exception);
-        number_pixels=columns*rows;
-        tile_pixels=(uint32 *) AcquireQuantumMemory(number_pixels,
-          sizeof(*tile_pixels));
+        number_pixels=(MagickSizeType) columns*rows;
+        if ((number_pixels*sizeof(uint32)) != (MagickSizeType) ((size_t)
+            (number_pixels*sizeof(uint32))))
+          {
+            TIFFClose(tiff);
+            ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
+          }
+        tile_pixels=(uint32 *) AcquireQuantumMemory(columns,
+          rows*sizeof(*tile_pixels));
         if (tile_pixels == (uint32 *) NULL)
           {
             TIFFClose(tiff);