imagemagick: Fix CVE-2026-22770

Reference: 3e03307210

Signed-off-by: Nitin Wankhade <nitin.wankhade333@gmail.com>
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
This commit is contained in:
Nitin Wankhade 2026-03-18 02:09:37 -07:00 committed by Gyorgy Sarvari
parent 6afc673218
commit b091a7cc12
2 changed files with 38 additions and 0 deletions

View File

@ -0,0 +1,37 @@
From 3e0330721020e0c5bb52e4b77c347527dd71658e Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@lemstra.org>
Date: Sun, 4 Jan 2026 15:26:48 +0100y
Subject: [PATCH] imagemagick: Fix CVE-2026-22770
CVE: CVE-2026-22770
Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/3e0330721020e0c5bb52e4b77c347527dd71658e]
Signed-off-by: Nitin Wankhade <nitin.wankhade333@gmail.com>
===
diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index bfb1363..3a44240 100644
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -880,16 +880,21 @@ static double **AcquireBilateralThreadSet(const size_t number_threads,
double
**weights;
+ size_t
+ count;
+
ssize_t
i;
+ if (HeapOverflowSanityCheckGetSize(height,sizeof(**weights),&count) != MagickFalse)
+ return((double **) NULL);
weights=(double **) AcquireQuantumMemory(number_threads+1,sizeof(*weights));
if (weights == (double **) NULL)
return((double **) NULL);
- (void) memset(weights,0,number_threads*sizeof(*weights));
+ (void) memset(weights,0,(number_threads+1)*sizeof(*weights));
for (i=0; i <= (ssize_t) number_threads; i++)
{
- weights[i]=(double *) AcquireQuantumMemory(width,height*sizeof(**weights));
+ weights[i]=(double *) AcquireQuantumMemory(width,count);
if (weights[i] == (double *) NULL)
return(DestroyBilateralThreadSet(number_threads,weights));
}

View File

@ -51,6 +51,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt
file://CVE-2025-43965.patch \
file://CVE-2025-66628.patch \
file://CVE-2025-68618.patch \
file://CVE-2026-22770.patch \
"
SRCREV = "35b4991eb0939a327f3489988c366e21068b0178"