]> granicus.if.org Git - imagemagick/commitdiff
https://oss-fuzz.com/v2/testcase-detail/4914657606238208?noredirect=1
authorCristy <urban-warrior@imagemagick.org>
Sun, 25 Mar 2018 23:28:12 +0000 (19:28 -0400)
committerCristy <urban-warrior@imagemagick.org>
Sun, 25 Mar 2018 23:28:12 +0000 (19:28 -0400)
coders/tiff.c

index 72ea083132ddd19ab75d8d3d2ccdb20d88e693c3..223fe7168071afa0c17c7be559edd0f5b071845b 100644 (file)
@@ -1764,8 +1764,8 @@ RestoreMSCWarning
       ThrowTIFFException(CorruptImageError,"InsufficientImageDataInFile");
     tiff_pixels=(unsigned char *) AcquireMagickMemory(MagickMax(
       TIFFScanlineSize(tiff),MagickMax((ssize_t) image->columns*
-      samples_per_pixel*pow(2.0,ceil(log(bits_per_sample)/log(2.0))),
-      image->columns*rows_per_strip)*sizeof(uint32)));
+      MagickMax(samples_per_pixel,3)*pow(2.0,ceil(log(bits_per_sample)/
+      log(2.0))),image->columns*rows_per_strip)*sizeof(uint32)));
     if (tiff_pixels == (unsigned char *) NULL)
       ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
     switch (method)