mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-15 16:07:26 +00:00
imagemagick: patch CVE-2025-65955
Details: https://nvd.nist.gov/vuln/detail/CVE-2025-65955 Pick the patch that is mentioned by the NVD advisory. Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> Signed-off-by: Anuj Mittal <anuj.mittal@oss.qualcomm.com>
This commit is contained in:
committed by
Anuj Mittal
parent
24e4caa837
commit
626bcb7f86
@@ -0,0 +1,25 @@
|
|||||||
|
From c798be8690cd314c115c568ee90136e65c53b90b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Dirk Lemstra <dirk@lemstra.org>
|
||||||
|
Date: Sun, 23 Nov 2025 09:17:29 +0100
|
||||||
|
Subject: [PATCH] Correct incorrect free (GHSA-q3hc-j9x5-mp9m)
|
||||||
|
|
||||||
|
CVE: CVE-2025-65955
|
||||||
|
Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/6f81eb15f822ad86e8255be75efad6f9762c32f8]
|
||||||
|
Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
|
||||||
|
---
|
||||||
|
Magick++/lib/Options.cpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
|
||||||
|
index 5d5724c96..eba417cca 100644
|
||||||
|
--- a/Magick++/lib/Options.cpp
|
||||||
|
+++ b/Magick++/lib/Options.cpp
|
||||||
|
@@ -310,7 +310,7 @@ void Magick::Options::fontFamily(const std::string &family_)
|
||||||
|
{
|
||||||
|
if (family_.length() == 0)
|
||||||
|
{
|
||||||
|
- _drawInfo->family=(char *) RelinquishMagickMemory(_drawInfo->font);
|
||||||
|
+ _drawInfo->family=(char *) RelinquishMagickMemory(_drawInfo->family);
|
||||||
|
DestroyString(RemoveImageOption(imageInfo(),"family"));
|
||||||
|
}
|
||||||
|
else
|
||||||
@@ -24,6 +24,7 @@ SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt
|
|||||||
file://CVE-2025-57803.patch \
|
file://CVE-2025-57803.patch \
|
||||||
file://CVE-2025-57807.patch \
|
file://CVE-2025-57807.patch \
|
||||||
file://CVE-2025-62171.patch \
|
file://CVE-2025-62171.patch \
|
||||||
|
file://CVE-2025-65955.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "82572afc879b439cbf8c9c6f3a9ac7626adf98fb"
|
SRCREV = "82572afc879b439cbf8c9c6f3a9ac7626adf98fb"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user