From 2dce0663d328891a9b08924f4b453af289fbdf80 Mon Sep 17 00:00:00 2001 From: starlet-dx <15929766099@163.com> Date: Tue, 22 Nov 2022 20:15:21 +0800 Subject: [PATCH] Fix CVE-2022-32547 --- CVE-2022-32547.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ ImageMagick.spec | 6 +++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 CVE-2022-32547.patch diff --git a/CVE-2022-32547.patch b/CVE-2022-32547.patch new file mode 100644 index 0000000..14bbe50 --- /dev/null +++ b/CVE-2022-32547.patch @@ -0,0 +1,43 @@ +From eac8ce4d873f28bb6a46aa3a662fb196b49b95d0 Mon Sep 17 00:00:00 2001 +From: xiaoxiaoafeifei +Date: Sat, 9 Apr 2022 20:34:03 +0800 +Subject: [PATCH] fix #5033: runtime error: load of misaligned address (#5034) + +* fix Division by zero in XMenuWidget() of MagickCore/widget.c + +* Fix memory leak in AnimateImageCommand() of MagickWand/animate.c and DisplayImageCommand() of MagickWand/display.c + +* fix Division by zero in ReadEnhMetaFile() of coders/emf.c + +* Resolve conflicts + +* fix issue: outside the range of representable values of type 'unsigned char' at coders/psd.c:1025 + +* fix error: 4e+26 is outside the range of representable values of type 'unsigned long' at coders/pcl.c:299 + +* fix #5033:runtime error: load of misaligned address + +Co-authored-by: zhailiangliang +--- + MagickCore/property.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/MagickCore/property.c b/MagickCore/property.c +index 8175dd1f73..6e72cac157 100644 +--- a/MagickCore/property.c ++++ b/MagickCore/property.c +@@ -1545,12 +1545,12 @@ static MagickBooleanType GetEXIFProperty(const Image *image, + } + case EXIF_FMT_SINGLE: + { +- EXIFMultipleValues(4,"%f",(double) *(float *) p1); ++ EXIFMultipleValues(4,"%f",(double)ReadPropertySignedLong(endian,p1)); + break; + } + case EXIF_FMT_DOUBLE: + { +- EXIFMultipleValues(8,"%f",*(double *) p1); ++ EXIFMultipleValues(8,"%f",(double)ReadPropertySignedLong(endian,p1)); + break; + } + case EXIF_FMT_STRING: diff --git a/ImageMagick.spec b/ImageMagick.spec index ed32b68..ad5db32 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,7 +1,7 @@ Name: ImageMagick Epoch: 1 Version: 7.1.0.28 -Release: 3 +Release: 4 Summary: Create, edit, compose, or convert bitmap images License: ImageMagick and MIT Url: http://www.imagemagick.org/ @@ -9,6 +9,7 @@ Source0: https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1 Patch0001: backport-fix-CVE-2022-2719.patch Patch0002: backport-fix-CVE-2022-1115.patch +Patch0003: CVE-2022-32547.patch BuildRequires: bzip2-devel freetype-devel libjpeg-devel libpng-devel perl-generators BuildRequires: libtiff-devel giflib-devel zlib-devel perl-devel >= 5.8.1 jbigkit-devel @@ -163,6 +164,9 @@ rm PerlMagick/demo/Generic.ttf %{_libdir}/pkgconfig/ImageMagick* %changelog +* Tue Nov 22 2022 yaoxin - 1:7.1.0.28-4 +- Fix CVE-2022-32547 + * Fri Aug 19 2022 cenhuilin - 1:7.1.0.28-3 - fix CVE-2022-1115 -- Gitee