commit 3c987d4f39ead2138f978a39726a62c31ea7445f
author Cristy <mikayla-grace@urban-warrior.org> Fri May 01 06:42:59 2020 -0400
committer Cristy <mikayla-grace@urban-warrior.org> Fri May 01 06:42:59 2020 -0400
tree 5f37d6265139798a42076d5a17b8a6750f015740
parent 28e88648c9740a0dec729f605b0db85573b36b6c

Pad size is uint64 for BigTIFF

coders/tiff.c

diff --git a/coders/tiff.c b/coders/tiff.c
index 042a249..798611f 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -1942,7 +1942,12 @@
         /*
           Convert stripped TIFF image.
         */
-        extent=TIFFStripSize(tiff)+sizeof(uint32);
+        extent=TIFFStripSize(tiff);
+#if defined(TIFF_VERSION_BIG)
+        extent+=sizeof(uint64);
+#else
+        extent+=sizeof(uint32);
+#endif
         strip_pixels=(unsigned char *) AcquireQuantumMemory(extent,
           sizeof(*strip_pixels));
         if (strip_pixels == (unsigned char *) NULL)
@@ -2038,7 +2043,12 @@
         number_pixels=(MagickSizeType) columns*rows;
         if (HeapOverflowSanityCheck(rows,sizeof(*tile_pixels)) != MagickFalse)
           ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
-        extent=TIFFTileSize(tiff)+sizeof(uint32);
+        extent=TIFFTileSize(tiff);
+#if defined(TIFF_VERSION_BIG)
+        extent+=sizeof(uint64);
+#else
+        extent+=sizeof(uint32);
+#endif
         tile_pixels=(unsigned char *) AcquireQuantumMemory(extent,
           sizeof(*tile_pixels));
         if (tile_pixels == (unsigned char *) NULL)