ImageMagick/CVE-2020-25666-1.patch
2021-04-06 10:05:34 +08:00

31 lines
1.3 KiB
Diff

From 91ae12c57f3b9b23f2072462c27a8378b59f395e Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 13 Oct 2019 11:56:58 -0400
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1750
---
magick/histogram.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/magick/histogram.c b/magick/histogram.c
index 36b803a77..68e25fc83 100644
--- a/magick/histogram.c
+++ b/magick/histogram.c
@@ -1157,12 +1157,12 @@ static int HistogramCompare(const void *x,const void *y)
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->red-(ssize_t) color_2->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->green-(ssize_t) color_2->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->blue-(ssize_t) color_2->blue));
+ return((int) ((ssize_t) color_2->count-(ssize_t) color_1->count));
}
#if defined(__cplusplus) || defined(c_plusplus)