version 2.2.16 remove obsolete psd-invalid-dimensions patch

This commit is contained in:
Nils Philippsen 2007-07-09 15:37:48 +00:00
parent 6342740461
commit ab85a32463
4 changed files with 19 additions and 25 deletions

View File

@ -1 +1 @@
gimp-2.2.15.tar.bz2 gimp-2.2.16.tar.bz2

View File

@ -1,19 +0,0 @@
--- gimp-2.2.15/plug-ins/common/psd.c.psd-invalid-dimensions 2007-04-17 23:11:24.000000000 +0200
+++ gimp-2.2.15/plug-ins/common/psd.c 2007-06-27 13:06:24.000000000 +0200
@@ -1199,9 +1199,15 @@ seek_to_and_unpack_pixeldata(FILE* fd, g
compression = getgshort(fd, "layer channel compression type");
offset+=2;
- width = channel->width;
+ width = channel->width;
height = channel->height;
+ if (width > G_MAXINT16 || height > G_MAXINT16)
+ {
+ g_message ("Error: Invalid channel dimensions");
+ gimp_quit ();
+ }
+
IFDBG
{
printf("\t\t\tLayer (%d) Channel (%d:%d) Compression: %d (%s)\n",

View File

@ -36,14 +36,14 @@
Summary: GNU Image Manipulation Program Summary: GNU Image Manipulation Program
Name: gimp Name: gimp
Version: 2.2.15 Version: 2.2.16
%define binver 2.2 %define binver 2.2
%define gimp_lang_ver 20 %define gimp_lang_ver 20
%define interfacever 2.0 %define interfacever 2.0
%define age 0 %define age 0
%define minorver 200 %define minorver 200
%define microver %(ver=%{version}; echo ${ver##*.*.}) %define microver %(ver=%{version}; echo ${ver##*.*.})
Release: 3%{?dist} Release: 1%{?dist}
Epoch: 2 Epoch: 2
License: GPL, LGPL License: GPL, LGPL
Group: Applications/Multimedia Group: Applications/Multimedia
@ -107,7 +107,6 @@ Patch2: gimp-2.2.3-icontheme.patch
Patch4: gimp-2.2.4-gifload.patch Patch4: gimp-2.2.4-gifload.patch
Patch5: gimp-2.2.11-htmlview.patch Patch5: gimp-2.2.11-htmlview.patch
Patch6: gimp-2.2.11-gimptool.patch Patch6: gimp-2.2.11-gimptool.patch
Patch7: gimp-2.2.15-psd-invalid-dimensions.patch
%description %description
GIMP (GNU Image Manipulation Program) is a powerful image composition and GIMP (GNU Image Manipulation Program) is a powerful image composition and
@ -162,7 +161,6 @@ EOF
%patch4 -p1 -b .gifload %patch4 -p1 -b .gifload
%patch5 -p1 -b .htmlview %patch5 -p1 -b .htmlview
%patch6 -p1 -b .gimptool %patch6 -p1 -b .gimptool
%patch7 -p1 -b .psd-invalid-dimensions
%build %build
libtoolize --copy --force libtoolize --copy --force
@ -426,6 +424,21 @@ fi
%{_libdir}/pkgconfig/* %{_libdir}/pkgconfig/*
%changelog %changelog
* Mon Jul 09 2007 Nils Philippsen <nphilipp@redhat.com> - 2:2.2.16-1
- version 2.2.16
Bugs fixed in GIMP 2.2.16
=========================
- improved input value validation in several file plug-ins (bug #453973)
- improved handling of corrupt or invalid XCF files
- guard against integer overflows in several file plug-ins (bug #451379)
- fixed handling of background alpha channel in XCF files (bug #443097)
- improved forward compatibility of the config parser
- fixed crash when previewing some animated brushes (bug #446005)
- remove obsolete psd-invalid-dimensions patch
* Wed Jun 27 2007 Nils Philippsen <nphilipp@redhat.com> - 2:2.2.15-3 * Wed Jun 27 2007 Nils Philippsen <nphilipp@redhat.com> - 2:2.2.15-3
- refuse to open PSD files with insanely large dimensions (#244400, fix by Sven - refuse to open PSD files with insanely large dimensions (#244400, fix by Sven
Neumann) Neumann)

View File

@ -1 +1 @@
5e705f0c7a3b37703d407e88bee357bb gimp-2.2.15.tar.bz2 d50c30eddbd3736156036af2e91fd526 gimp-2.2.16.tar.bz2