Update to 7.1.1.15
This commit is contained in:
parent
fe850e336b
commit
5ed43d6c49
Binary file not shown.
@ -1,25 +0,0 @@
|
||||
From a531d28e31309676ce8168c3b6dbbb5374b78790 Mon Sep 17 00:00:00 2001
|
||||
From: Cristy <urban-warrior@imagemagick.org>
|
||||
Date: Mon, 26 Jun 2023 19:38:12 -0400
|
||||
Subject: [PATCH] heap-buffer-overflow in ImageMagick <= 7.1.1-12, contributed
|
||||
by Hardik shah of Vehere (Dawn Treaders team)
|
||||
|
||||
Origin: https://github.com/ImageMagick/ImageMagick/commit/a531d28e31309676ce8168c3b6dbbb5374b78790
|
||||
|
||||
---
|
||||
coders/tiff.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/coders/tiff.c b/coders/tiff.c
|
||||
index 9e0d0b1201..df4274cacd 100644
|
||||
--- a/coders/tiff.c
|
||||
+++ b/coders/tiff.c
|
||||
@@ -2010,7 +2010,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info,
|
||||
number_pixels=(MagickSizeType) columns*rows;
|
||||
if (HeapOverflowSanityCheck(rows,sizeof(*tile_pixels)) != MagickFalse)
|
||||
ThrowTIFFException(ResourceLimitError,"MemoryAllocationFailed");
|
||||
- extent=4*(samples_per_pixel+1)*MagickMax(rows*TIFFTileRowSize(tiff),
|
||||
+ extent=4*(samples_per_pixel+1)*MagickMax((rows+1)*TIFFTileRowSize(tiff),
|
||||
TIFFTileSize(tiff));
|
||||
tile_pixels=(unsigned char *) AcquireQuantumMemory(extent,
|
||||
sizeof(*tile_pixels));
|
||||
@ -1,12 +1,11 @@
|
||||
Name: ImageMagick
|
||||
Epoch: 1
|
||||
Version: 7.1.1.11
|
||||
Release: 3
|
||||
Version: 7.1.1.15
|
||||
Release: 1
|
||||
Summary: Create, edit, compose, or convert bitmap images
|
||||
License: ImageMagick and MIT
|
||||
Url: http://www.imagemagick.org/
|
||||
Source0: https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-11.tar.gz
|
||||
Patch0: CVE-2023-3428.patch
|
||||
Source0: https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.1-15.tar.gz
|
||||
Patch1: CVE-2023-5341.patch
|
||||
|
||||
BuildRequires: bzip2-devel freetype-devel libjpeg-devel libpng-devel perl-generators
|
||||
@ -74,7 +73,7 @@ Requires: ImageMagick-devel = %{epoch}:%{version}-%{release}
|
||||
Development files for ImageMagick-c++.
|
||||
|
||||
%prep
|
||||
%autosetup -n ImageMagick-7.1.1-11 -p1
|
||||
%autosetup -n ImageMagick-7.1.1-15 -p1
|
||||
|
||||
install -d Magick++/examples
|
||||
cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples
|
||||
@ -162,6 +161,9 @@ rm PerlMagick/demo/Generic.ttf
|
||||
%{_libdir}/pkgconfig/ImageMagick*
|
||||
|
||||
%changelog
|
||||
* Mon Oct 23 2023 wulei <wu_lei@hoperun.com> - 1:7.1.1.15-1
|
||||
- Update to 7.1.1.15
|
||||
|
||||
* Sat Oct 7 2023 liningjie <liningjie@xfusion.com> - 1:7.1.1.11-3
|
||||
- Fix CVE-2023-5341
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user