File ImageMagick-CVE-2020-25666.patch of Package ImageMagick.30956
Index: ImageMagick-6.8.8-1/magick/histogram.c
===================================================================
--- ImageMagick-6.8.8-1.orig/magick/histogram.c 2013-12-22 02:50:17.000000000 +0100
+++ ImageMagick-6.8.8-1/magick/histogram.c 2020-12-08 13:25:50.628401534 +0100
@@ -1102,12 +1102,12 @@ static int HistogramCompare(const void *
color_1=(const ColorPacket *) x;
color_2=(const ColorPacket *) y;
if (color_2->pixel.red != color_1->pixel.red)
- return((int) color_1->pixel.red-(int) color_2->pixel.red);
+ return((int) ((ssize_t) color_1->pixel.red-(ssize_t) color_2->pixel.red));
if (color_2->pixel.green != color_1->pixel.green)
- return((int) color_1->pixel.green-(int) color_2->pixel.green);
+ return((int) ((ssize_t) color_1->pixel.green-(ssize_t) color_2->pixel.green));
if (color_2->pixel.blue != color_1->pixel.blue)
- return((int) color_1->pixel.blue-(int) color_2->pixel.blue);
- return((int) color_2->count-(int) color_1->count);
+ return((int) ((ssize_t) color_1->pixel.blue-(ssize_t) color_2->pixel.blue));
+ return((int) ((ssize_t) color_2->count-(ssize_t) color_1->count));
}
#if defined(__cplusplus) || defined(c_plusplus)