diff --git a/0001-bugfix-for-CVE-2025-65955.patch b/0001-bugfix-for-CVE-2025-65955.patch new file mode 100644 index 0000000000000000000000000000000000000000..8ce855c8bf1f353cbf52cd3d2a46510199393430 --- /dev/null +++ b/0001-bugfix-for-CVE-2025-65955.patch @@ -0,0 +1,25 @@ +From 6f81eb15f822ad86e8255be75efad6f9762c32f8 Mon Sep 17 00:00:00 2001 +From: Dirk Lemstra +Date: Sun, 23 Nov 2025 09:17:29 +0100 +Subject: [PATCH] Correct incorrect free (GHSA-q3hc-j9x5-mp9m) + +--- + 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 c256045..027d547 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 +-- +2.43.5 + diff --git a/ImageMagick.spec b/ImageMagick.spec index af4eaa69231b2f06cc59854adb3d59ba1cf27362..c4d4ab61e491b624f648d68d1b3a22d5b50c472c 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,4 +1,4 @@ -%define anolis_release 1 +%define anolis_release 2 %bcond_without tests %bcond_with libheif @@ -19,6 +19,9 @@ License: ImageMagick URL: https://imagemagick.org/ Source0: https://imagemagick.org/archive/releases/%{name}-%{VER}-%{Patchlevel}.tar.xz +# https://github.com/ImageMagick/ImageMagick/commit/6f81eb15f822ad86e8255be75efad6f9762c32f8 +Patch1: 0001-bugfix-for-CVE-2025-65955.patch + BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(freetype2) BuildRequires: pkgconfig(libjpeg) @@ -351,6 +354,9 @@ rm PerlMagick/demo/Generic.ttf %{_mandir}/man3/* %changelog +* Thu Dec 04 2025 YangCheng - 7.1.2.8-2 +- Add patch to fix CVE-2025-65955 + * Mon Nov 3 2025 wh02252983 - 7.1.2.8-1 - Update to 7.1.2.8 to fix CVE-2025-62594 - Upgrade version includes deleted patch code.