diff options
| author | Remi Collet <remi@remirepo.net> | 2021-06-23 17:21:49 +0200 |
|---|---|---|
| committer | Remi Collet <remi@remirepo.net> | 2021-06-23 17:21:49 +0200 |
| commit | cf1fe40643ae7a7a22316b18c4db5ab5448dac08 (patch) | |
| tree | 98cc2499225beea9a57191372966795c0a5979c5 | |
| parent | f7b1d0c12c2d9b090363787d4bc073f4ee564f9d (diff) | |
fix memory corruption using fix from
https://github.com/ImageMagick/ImageMagick6/pull/160
| -rw-r--r-- | 160.patch | 31 | ||||
| -rw-r--r-- | ImageMagick6.spec | 9 |
2 files changed, 39 insertions, 1 deletions
diff --git a/160.patch b/160.patch new file mode 100644 index 0000000..90d1736 --- /dev/null +++ b/160.patch @@ -0,0 +1,31 @@ +From 83fc01755a8cfd082000085e89a2cced085b1326 Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 23 Jun 2021 16:42:15 +0200 +Subject: [PATCH] fix memory corruption in ConcatenateStringInfo + +--- + magick/string.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/magick/string.c b/magick/string.c +index 23f9361d0..5535b9a51 100644 +--- a/magick/string.c ++++ b/magick/string.c +@@ -564,7 +564,6 @@ MagickExport void ConcatenateStringInfo(StringInfo *string_info, + length+=source->length; + if (~length < MagickPathExtent) + ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); +- string_info->length=length; + if (string_info->datum == (unsigned char *) NULL) + string_info->datum=(unsigned char *) AcquireQuantumMemory(length+ + MagickPathExtent,sizeof(*string_info->datum)); +@@ -574,7 +573,8 @@ MagickExport void ConcatenateStringInfo(StringInfo *string_info, + sizeof(*string_info->datum)); + if (string_info->datum == (unsigned char *) NULL) + ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); +- (void) memcpy(string_info->datum+length,source->datum,source->length); ++ (void) memcpy(string_info->datum+string_info->length,source->datum,source->length); ++ string_info->length=length; + } + + /* diff --git a/ImageMagick6.spec b/ImageMagick6.spec index eab8737..688b315 100644 --- a/ImageMagick6.spec +++ b/ImageMagick6.spec @@ -50,13 +50,15 @@ Name: %{libname}6 %global move 1 %endif Version: %{VER}.%{Patchlevel} -Release: 1%{?dist} +Release: 2%{?dist} Summary: An X application for displaying and manipulating images License: ImageMagick Url: http://www.imagemagick.org/ #Source0: ftp://ftp.ImageMagick.org/pub/ImageMagick/ImageMagick-%%{VER}-%%{Patchlevel}.tar.xz Source0: https://www.imagemagick.org/download/ImageMagick-%{VER}-%{Patchlevel}.tar.xz +Patch0: 160.patch + BuildRequires: gcc BuildRequires: gcc-c++ %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 @@ -351,6 +353,7 @@ however. %prep %setup -q -n %{libname}-%{VER}-%{Patchlevel} +%patch0 -p1 # for %%doc mkdir Magick++/examples @@ -609,6 +612,10 @@ fi %changelog +* Wed Jun 23 2021 Remi Collet <remi@remirepo.net> - 6.9.12.16-2 +- fix memory corruption using fix from + https://github.com/ImageMagick/ImageMagick6/pull/160 + * Tue Jun 22 2021 Remi Collet <remi@remirepo.net> - 6.9.12.16-1 - update to version 6.9.12 patch level 16 |