From 39414220626f0abd5f30fa6efd7dd20839e11c32 Mon Sep 17 00:00:00 2001 From: chenmaodong Date: Tue, 10 May 2022 03:53:38 +0000 Subject: [PATCH] fix potential memory leak in ReadPSImage in coders/ps.c. The version of imagemagick is lower than origin community of imagemagick, so adapt the patch to fit opneuler. https://github.com/ImageMagick/ImageMagick/issues/2143 https://github.com/ImageMagick/ImageMagick/commit/a88e7ba719c8cb1dc997f982177cfeffd2cb2eea --- 0001-fix-potential-memory-leak.patch | 34 ++++++++++++++++++++++++++++ ImageMagick.spec | 6 ++++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 0001-fix-potential-memory-leak.patch diff --git a/0001-fix-potential-memory-leak.patch b/0001-fix-potential-memory-leak.patch new file mode 100644 index 0000000..09755c2 --- /dev/null +++ b/0001-fix-potential-memory-leak.patch @@ -0,0 +1,34 @@ +From 500ae85823b6b0713819139207a1d1d45723c36f Mon Sep 17 00:00:00 2001 +From: chenmaodong +Date: Tue, 10 May 2022 11:45:03 +0800 +Subject: [PATCH] reason:fix potential memory leak + +Conflict: coders/ps.c +Reference: https://github.com/ImageMagick/ImageMagick/commit/8ed6d1d52957b74c75ec8037ad698f714b9fb918 +Signed-off-by: chenmaodong +--- + coders/ps.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/coders/ps.c b/coders/ps.c +index 2cba2c4..d9227cc 100644 +--- a/coders/ps.c ++++ b/coders/ps.c +@@ -710,6 +710,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) + (void) ThrowMagickException(exception,GetMagickModule(),OptionError, + "InvalidGeometry","`%s'",option); + geometry=DestroyString(geometry); ++ CleanupPSInfo(&info); + image=DestroyImage(image); + return((Image *) NULL); + } +@@ -866,6 +867,7 @@ static Image *ReadPSImage(const ImageInfo *image_info,ExceptionInfo *exception) + if (*message != '\0') + (void) ThrowMagickException(exception,GetMagickModule(),DelegateError, + "PostscriptDelegateFailed","`%s'",message); ++ CleanupPSInfo(&info); + image=DestroyImageList(image); + return((Image *) NULL); + } +-- +2.27.0 diff --git a/ImageMagick.spec b/ImageMagick.spec index 9c89cb3..3cf18a0 100644 --- a/ImageMagick.spec +++ b/ImageMagick.spec @@ -1,11 +1,12 @@ Name: ImageMagick Epoch: 1 Version: 6.9.12.42 -Release: 1 +Release: 2 Summary: Create, edit, compose, or convert bitmap images License: ImageMagick and MIT Url: http://www.imagemagick.org/ Source0: https://mirrors.sohu.com/gentoo/distfiles/db/ImageMagick-6.9.12-42.tar.xz +Patch0: 0001-fix-potential-memory-leak.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 May 10 2022 chenmaodong - 1:6.9.12.42-2 +- fix memory leak in ReadPSImage in coders/ps.c + * Thu Mar 10 2022 wangkai - 6.9.12.42-1 - Update to 6.9.12.42 for fix CVE-2021-39212 CVE-2021-3596 -- Gitee