https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31161

diff --git a/ChangeLog b/ChangeLog
index 5da27f3b1646478cf8388d43d236b33a44f9d765..03739301c6807f7e2f0f9a8aa60c3dc5e30e9970 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-01-04  7.0.4-3 Cristy  <quetzlzacatenango@image...>
+  * Increase memory allocation for TIFF pixels (reference
+    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31161).
+
 2017-01-03  7.0.4-2 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.4-2, GIT revision 19318:8766311:20170103.
 

diff --git a/coders/tiff.c b/coders/tiff.c
index a8e40e25f40cbb05f4d1458e702c61ad72fd1ede..a3c6a4a79224f3e002d8c420633080dca07e2dba 100644 (file)
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1608,8 +1608,9 @@ RestoreMSCWarning
       method=ReadTileMethod;
     quantum_info->endian=LSBEndian;
     quantum_type=RGBQuantum;
-    tiff_pixels=(unsigned char *) AcquireMagickMemory(TIFFScanlineSize(tiff)+
-      sizeof(uint32));
+    tiff_pixels=(unsigned char *) AcquireMagickMemory(MagickMax(
+      TIFFScanlineSize(tiff),(size_t) (image->columns*samples_per_pixel*
+      pow(2.0,ceil(log(bits_per_sample)/log(2.0))))));
     if (tiff_pixels == (unsigned char *) NULL)
       {
         TIFFClose(tiff);