mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-10-01 04:17:14 +00:00
9063cb0d9f
Fix following CVEs for imagemagick: CVE-2021-20311, CVE-2021-20312, CVE-2021-20313 CVE-2021-20309, CVE-2021-20310, CVE-2021-3610 CVE-2022-0284, CVE-2022-2719 fix-cipher-leak.patch fixes CVE-2021-20311, CVE-2021-20312, CVE-2021-20313 Ignore following CVES as current version is not affected by them: CVE-2014-9826, CVE-2016-7538, CVE-2017-5506 Signed-off-by: Sana Kazi <sanakazi720@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
From e50f19fd73c792ebe912df8ab83aa51a243a3da7 Mon Sep 17 00:00:00 2001
|
|
From: Cristy <urban-warrior@imagemagick.org>
|
|
Date: Wed, 19 Jan 2022 16:26:12 -0500
|
|
Subject: [PATCH] https://github.com/ImageMagick/ImageMagick/issues/4729
|
|
|
|
CVE: CVE-2022-0284
|
|
Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/e50f19fd73c792ebe912df8ab83aa51a243a3da7.patch]
|
|
Signed-off-by: Sana Kazi Sana.Kazi@kpit.com
|
|
---
|
|
coders/xpm.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/coders/xpm.c b/coders/xpm.c
|
|
index 782ed732544..5f73df8bca4 100644
|
|
--- a/coders/xpm.c
|
|
+++ b/coders/xpm.c
|
|
@@ -773,7 +773,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
|
|
break;
|
|
for (x=0; x < (ssize_t) picon->columns; x++)
|
|
{
|
|
- if (GetPixelAlpha(image,q) == (Quantum) TransparentAlpha)
|
|
+ if (GetPixelAlpha(picon,q) == (Quantum) TransparentAlpha)
|
|
transparent=MagickTrue;
|
|
else
|
|
SetPixelAlpha(picon,OpaqueAlpha,q);
|
|
@@ -804,7 +804,7 @@ static MagickBooleanType WritePICONImage(const ImageInfo *image_info,
|
|
break;
|
|
for (x=0; x < (ssize_t) picon->columns; x++)
|
|
{
|
|
- if (GetPixelAlpha(image,q) == (Quantum) TransparentAlpha)
|
|
+ if (GetPixelAlpha(picon,q) == (Quantum) TransparentAlpha)
|
|
SetPixelIndex(picon,(Quantum) picon->colors,q);
|
|
q+=GetPixelChannels(picon);
|
|
}
|