diff options
| -rw-r--r-- | meta-oe/recipes-support/imagemagick/files/CVE-2025-65955.patch | 25 | ||||
| -rw-r--r-- | meta-oe/recipes-support/imagemagick/imagemagick_7.0.10.bb | 1 |
2 files changed, 26 insertions, 0 deletions
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 @@ | |||
| 1 | From f4e53579d8906c939e4169b9e14c5fe867e2b6b8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Dirk Lemstra <dirk@lemstra.org> | ||
| 3 | Date: Sun, 23 Nov 2025 09:17:29 +0100 | ||
| 4 | Subject: [PATCH] Correct incorrect free (GHSA-q3hc-j9x5-mp9m) | ||
| 5 | |||
| 6 | CVE: CVE-2025-65955 | ||
| 7 | Upstream-Status: Backport [https://github.com/ImageMagick/ImageMagick/commit/6f81eb15f822ad86e8255be75efad6f9762c32f8] | ||
| 8 | Signed-off-by: Gyorgy Sarvari <skandigraun@gmail.com> | ||
| 9 | --- | ||
| 10 | Magick++/lib/Options.cpp | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp | ||
| 14 | index 9d2a5904b..14b06a724 100644 | ||
| 15 | --- a/Magick++/lib/Options.cpp | ||
| 16 | +++ b/Magick++/lib/Options.cpp | ||
| 17 | @@ -308,7 +308,7 @@ void Magick::Options::fontFamily(const std::string &family_) | ||
| 18 | { | ||
| 19 | if (family_.length() == 0) | ||
| 20 | { | ||
| 21 | - _drawInfo->family=(char *) RelinquishMagickMemory(_drawInfo->font); | ||
| 22 | + _drawInfo->family=(char *) RelinquishMagickMemory(_drawInfo->family); | ||
| 23 | DestroyString(RemoveImageOption(imageInfo(),"family")); | ||
| 24 | } | ||
| 25 | 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 | |||
| 46 | file://0011-ImageMagick-Add-support-patch-3-to-fix-CVE-2023-3415.patch \ | 46 | file://0011-ImageMagick-Add-support-patch-3-to-fix-CVE-2023-3415.patch \ |
| 47 | file://0011-ImageMagick-Fix-CVE-2023-34151.patch \ | 47 | file://0011-ImageMagick-Fix-CVE-2023-34151.patch \ |
| 48 | file://CVE-2022-1115.patch \ | 48 | file://CVE-2022-1115.patch \ |
| 49 | file://CVE-2025-65955.patch \ | ||
| 49 | " | 50 | " |
| 50 | 51 | ||
| 51 | SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" | 52 | SRCREV = "35b4991eb0939a327f3489988c366e21068b0178" |
