From 3aab73cffb935d41da6576e7b65b23729d60d375 Mon Sep 17 00:00:00 2001 From: Cristy Date: Sat, 7 May 2016 20:40:41 -0400 Subject: [PATCH] ... --- coders/tiff.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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); -- 2.40.0