File ImageMagick-CVE-2025-68469.patch of Package ImageMagick.42133

Index: ImageMagick-6.8.8-1/coders/tiff.c
===================================================================
--- ImageMagick-6.8.8-1.orig/coders/tiff.c
+++ ImageMagick-6.8.8-1/coders/tiff.c
@@ -1633,7 +1633,14 @@ RestoreMSCWarning
           *p;
 
 	size_t
-          extent;
+          extent,
+          length;
+
+        ssize_t
+          stride;
+
+        tmsize_t
+          tile_size;
 
         uint32
           *tile_pixels,
@@ -1654,7 +1661,11 @@ RestoreMSCWarning
           ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed")
         if (CheckMemoryOverflow(rows,sizeof(*tile_pixels)) != MagickFalse)
           ThrowTIFFException(ImageError,"WidthOrHeightExceedsLimit");
-	extent=MagickMax(rows*TIFFTileRowSize(tiff),TIFFTileSize(tiff));
+        tile_size=TIFFTileSize(tiff);
+        stride=(ssize_t) TIFFTileRowSize(tiff);
+        length=GetQuantumExtent(image,quantum_info,quantum_type);
+        extent=(size_t) MagickMax((size_t) tile_size,rows*
+          MagickMax((size_t) stride,length));
 #if defined(TIFF_VERSION_BIG)
         extent+=image->columns*sizeof(uint64);
 #else
openSUSE Build Service is sponsored by