1 Star 0 Fork 30

guoxiaoqi / ImageMagick

forked from src-openEuler / ImageMagick 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
CVE-2020-25666-2.patch 1.21 KB
一键复制 编辑 原始数据 按行查看 历史
wangxiao65 提交于 2021-04-06 09:19 . fix CVE-2020-25666 CVE-2020-25675
From 245d884e1868ff9b932adad5fcacf9e3e1eb4c7f Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 13 Oct 2019 14:44:54 -0400
Subject: [PATCH] ...
---
magick/histogram.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/magick/histogram.c b/magick/histogram.c
index 68e25fc83..ca210f71c 100644
--- a/magick/histogram.c
+++ b/magick/histogram.c
@@ -1157,11 +1157,11 @@ 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) ((ssize_t) color_1->red-(ssize_t) color_2->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) ((ssize_t) color_1->green-(ssize_t) color_2->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) ((ssize_t) color_1->blue-(ssize_t) color_2->blue));
+ 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));
}
1
https://gitee.com/angela7/ImageMagick.git
git@gitee.com:angela7/ImageMagick.git
angela7
ImageMagick
ImageMagick
master

搜索帮助