From b9cf190949207103927c50be7f1876f08d02c3f2 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2016 14:24:33 +0000 Subject: import ImageMagick-6.7.8.9-12.el7_2 --- diff --git a/SOURCES/0002-1303227-fix-exr-crash.patch b/SOURCES/0002-1303227-fix-exr-crash.patch new file mode 100644 index 0000000..7fc9c85 --- /dev/null +++ b/SOURCES/0002-1303227-fix-exr-crash.patch @@ -0,0 +1,12 @@ +diff -up ImageMagick-6.7.8-9/coders/exr.c.exr-crash ImageMagick-6.7.8-9/coders/exr.c +--- ImageMagick-6.7.8-9/coders/exr.c.exr-crash 2016-02-02 16:47:39.442691507 +0100 ++++ ImageMagick-6.7.8-9/coders/exr.c 2016-02-02 16:48:41.241648194 +0100 +@@ -195,7 +195,7 @@ static Image *ReadEXRImage(const ImageIn + return((Image *) NULL); + } + hdr_info=ImfInputHeader(file); +- ImfHeaderDisplayWindow(hdr_info,&min_x,&min_y,&max_x,&max_y); ++ ImfHeaderDataWindow(hdr_info,&min_x,&min_y,&max_x,&max_y); + image->columns=max_x-min_x+1UL; + image->rows=max_y-min_y+1UL; + image->matte=MagickTrue; diff --git a/SPECS/ImageMagick.spec b/SPECS/ImageMagick.spec index d24e491..3379e9e 100644 --- a/SPECS/ImageMagick.spec +++ b/SPECS/ImageMagick.spec @@ -3,7 +3,7 @@ Name: ImageMagick Version: %{VER}.%{Patchlevel} -Release: 10%{?dist} +Release: 12%{?dist} Summary: An X application for displaying and manipulating images Group: Applications/Multimedia License: ImageMagick @@ -12,6 +12,7 @@ Source0: ftp://ftp.ImageMagick.org/pub/%{name}/%{name}-%{VER}-%{Patchlevel}.tar Patch0: 0001-Fix-man-page-scan-results.patch Patch1: 0001-Fix-CVE-2014-1947-CVE-2014-2030.patch +Patch2: 0002-1303227-fix-exr-crash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, freetype-devel, libjpeg-devel, libpng-devel @@ -127,6 +128,7 @@ mkdir Magick++/examples cp -p Magick++/demo/*.cpp Magick++/demo/*.miff Magick++/examples %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %configure --enable-shared \ @@ -281,6 +283,9 @@ rm -rf %{buildroot} %doc PerlMagick/demo/ PerlMagick/Changelog PerlMagick/README.txt %changelog +* Tue Feb 2 2016 Jan Horak - 6.7.8.9-12 +- Fixed crash when processing .exr files (rhbz#1303227) + * Tue Apr 01 2014 Benjamin Tissoires 6.7.8.9-10 - backported r13736 to fix CVE-2014-1947, CVE-2014-2030 (rhbz#1083080)