1 Star 0 Fork 30

lvxiaoqian / ImageMagick

forked from src-openEuler / ImageMagick 
加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
CVE-2020-25667.patch 1.30 KB
一键复制 编辑 原始数据 按行查看 历史
From 14ba3e46a66c4799d643c7b959792e185c6599c7 Mon Sep 17 00:00:00 2001
From: Cristy <urban-warrior@imagemagick.org>
Date: Sun, 13 Oct 2019 11:20:29 -0400
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/1748
---
coders/tiff.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/coders/tiff.c b/coders/tiff.c
index c21f546bce..e7e6b67aa0 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -648,9 +648,20 @@ static void TIFFGetProfiles(TIFF *tiff,Image *image)
if ((TIFFGetField(tiff,TIFFTAG_XMLPACKET,&length,&profile) == 1) &&
(profile != (unsigned char *) NULL))
{
+ StringInfo
+ *dng;
+
(void) ReadProfile(image,"xmp",profile,(ssize_t) length);
- if (strstr((char *) profile,"dc:format=\"image/dng\"") != (char *) NULL)
- (void) CopyMagickString(image->magick,"DNG",MagickPathExtent);
+ dng=BlobToStringInfo(profile,length);
+ if (dng != (StringInfo *) NULL)
+ {
+ const char
+ *target = "dc:format=\"image/dng\"";
+
+ if (strstr((char *) GetStringInfoDatum(dng),target) != (char *) NULL)
+ (void) CopyMagickString(image->magick,"DNG",MagickPathExtent);
+ dng=DestroyStringInfo(dng);
+ }
}
#endif
if ((TIFFGetField(tiff,34118,&length,&profile) == 1) &&
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化
1
https://gitee.com/lvxiaoqian/ImageMagick.git
git@gitee.com:lvxiaoqian/ImageMagick.git
lvxiaoqian
ImageMagick
ImageMagick
master

搜索帮助

344bd9b3 5694891 D2dac590 5694891