d40d0a3afc
modified: ImageMagick.spec (cherry picked from commit 8e284e27aeb8bdfefa2b83919b3f0974a1cc777f)
55 lines
2.4 KiB
Diff
55 lines
2.4 KiB
Diff
From 309dfda1122f08fcf349b6f611b3b6df994d9297 Mon Sep 17 00:00:00 2001
|
|
From: Cristy <urban-warrior@imagemagick.org>
|
|
Date: Wed, 29 Jun 2022 19:40:56 -0400
|
|
Subject: [PATCH] eliminate possible buffer overflow
|
|
|
|
---
|
|
coders/tiff.c | 19 ++-----------------
|
|
1 file changed, 2 insertions(+), 17 deletions(-)
|
|
|
|
diff --git a/coders/tiff.c b/coders/tiff.c
|
|
index e2c6ca1093..6bf4b112e1 100644
|
|
--- a/coders/tiff.c
|
|
+++ b/coders/tiff.c
|
|
@@ -1901,12 +1901,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
|
|
/*
|
|
Convert stripped TIFF image.
|
|
*/
|
|
- extent=(samples_per_pixel+1)*TIFFStripSize(tiff);
|
|
-#if defined(TIFF_VERSION_BIG)
|
|
- extent+=samples_per_pixel*sizeof(uint64);
|
|
-#else
|
|
- extent+=samples_per_pixel*sizeof(uint32);
|
|
-#endif
|
|
+ extent=4*(samples_per_pixel+1)*TIFFStripSize(tiff);
|
|
strip_pixels=(unsigned char *) AcquireQuantumMemory(extent,
|
|
sizeof(*strip_pixels));
|
|
if (strip_pixels == (unsigned char *) NULL)
|
|
@@ -2002,13 +1997,8 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
|
|
number_pixels=(MagickSizeType) columns*rows;
|
|
if (HeapOverflowSanityCheck(rows,sizeof(*tile_pixels)) != MagickFalse)
|
|
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
|
|
- extent=(samples_per_pixel+1)*MagickMax(rows*TIFFTileRowSize(tiff),
|
|
+ extent=4*(samples_per_pixel+1)*MagickMax(rows*TIFFTileRowSize(tiff),
|
|
TIFFTileSize(tiff));
|
|
-#if defined(TIFF_VERSION_BIG)
|
|
- extent+=samples_per_pixel*sizeof(uint64);
|
|
-#else
|
|
- extent+=samples_per_pixel*sizeof(uint32);
|
|
-#endif
|
|
tile_pixels=(unsigned char *) AcquireQuantumMemory(extent,
|
|
sizeof(*tile_pixels));
|
|
if (tile_pixels == (unsigned char *) NULL)
|
|
@@ -2101,11 +2091,6 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
|
|
if (HeapOverflowSanityCheck(image->rows,sizeof(*pixels)) != MagickFalse)
|
|
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
|
|
number_pixels=(MagickSizeType) image->columns*image->rows;
|
|
-#if defined(TIFF_VERSION_BIG)
|
|
- number_pixels+=samples_per_pixel*sizeof(uint64);
|
|
-#else
|
|
- number_pixels+=samples_per_pixel*sizeof(uint32);
|
|
-#endif
|
|
generic_info=AcquireVirtualMemory(number_pixels,sizeof(uint32));
|
|
if (generic_info == (MemoryInfo *) NULL)
|
|
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
|