diff mbox series

[meta-oe,kirkstone,2/5] imagemagick: patch CVE-2025-65955

Message ID 20251224193434.2631122-2-skandigraun@gmail.com
State New
Headers show
Series [meta-oe,kirkstone,1/5] imagemagick: patch CVE-2022-1115 | expand

Commit Message

Gyorgy Sarvari Dec. 24, 2025, 7:34 p.m. UTC 
Details: https://nvd.nist.gov/vuln/detail/CVE-2025-65955

Pick the patch referenced by the NVD report.

Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com>
---
 .../imagemagick/files/CVE-2025-65955.patch    | 25 +++++++++++++++++++
 .../imagemagick/imagemagick_7.0.10.bb         |  1 +
 2 files changed, 26 insertions(+)
 create mode 100644 meta-oe/recipes-support/imagemagick/files/CVE-2025-65955.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/imagemagick/files/CVE-2025-65955.patch b/meta-oe/recipes-support/imagemagick/files/CVE-2025-65955.patch
new file mode 100644
index 0000000000..57fb1c1bf7
--- /dev/null
+++ b/meta-oe/recipes-support/imagemagick/files/CVE-2025-65955.patch
@@ -0,0 +1,25 @@ 
+From f4e53579d8906c939e4169b9e14c5fe867e2b6b8 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 9d2a5904b..14b06a724 100644
+--- a/Magick++/lib/Options.cpp
++++ b/Magick++/lib/Options.cpp
+@@ -308,7 +308,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
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
index 350b504400..83e9ff2fd0 100644
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb
@@ -46,6 +46,7 @@  SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=htt
     file://0011-ImageMagick-Add-support-patch-3-to-fix-CVE-2023-3415.patch \
     file://0011-ImageMagick-Fix-CVE-2023-34151.patch \
     file://CVE-2022-1115.patch \
+    file://CVE-2025-65955.patch \
 "
 
 SRCREV = "35b4991eb0939a327f3489988c366e21068b0178"