rpms/gimp/FC-6 gimp-2.2.15-psd-invalid-dimensions.patch, NONE, 1.1 gimp.spec, 1.113, 1.114

[fedora-cvs-commits at redhat.com]

Author: nphilipp

Update of /cvs/dist/rpms/gimp/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv25848

Modified Files:
	gimp.spec 
Added Files:
	gimp-2.2.15-psd-invalid-dimensions.patch 
Log Message:
refuse to open PSD files with insanely large dimensions (#244402, fix by Sven Neumann)
require gutenprint-plugin or gimp-print-plugin (#243593)
Resolves: #243593, #244402


gimp-2.2.15-psd-invalid-dimensions.patch:
 psd.c |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletion(-)

--- NEW FILE gimp-2.2.15-psd-invalid-dimensions.patch ---
--- 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",


Index: gimp.spec
===================================================================
RCS file: /cvs/dist/rpms/gimp/FC-6/gimp.spec,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- gimp.spec	1 Jun 2007 15:19:14 -0000	1.113
+++ gimp.spec	27 Jun 2007 15:11:51 -0000	1.114
@@ -43,7 +43,7 @@
 %define age 0
 %define minorver 200
 %define microver %(ver=%{version}; echo ${ver##*.*.})
-Release:    1%{?dist}
+Release:    3%{?dist}
 Epoch:		2
 License: 	GPL, LGPL
 Group: 		Applications/Multimedia
@@ -90,6 +90,11 @@
 Requires: 	gtk2 >= 2.4.14
 Requires:	pango >= 1.6.0
 Requires:	fontconfig >= 2.2.0
+%if %_enable_gutenprint
+Requires:   gutenprint-plugin
+%else
+Requires:   gimp-print-plugin
+%endif
 Requires(post): /usr/bin/update-desktop-database
 Requires(post): hicolor-icon-theme
 Requires(postun): /usr/bin/update-desktop-database
@@ -102,6 +107,7 @@
 Patch4:		gimp-2.2.4-gifload.patch
 Patch5:     gimp-2.2.11-htmlview.patch
 Patch6:     gimp-2.2.11-gimptool.patch
+Patch7:     gimp-2.2.15-psd-invalid-dimensions.patch
 
 %description
 GIMP (GNU Image Manipulation Program) is a powerful image composition and
@@ -156,6 +162,7 @@
 %patch4 -p1 -b .gifload
 %patch5 -p1 -b .htmlview
 %patch6 -p1 -b .gimptool
+%patch7 -p1 -b .psd-insane-dimensions
 
 %build
 libtoolize --copy --force
@@ -419,6 +426,13 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Wed Jun 27 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.15-3
+- refuse to open PSD files with insanely large dimensions (#244402, fix by Sven
+  Neumann)
+
+* Wed Jun 13 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.15-2
+- require gutenprint-plugin or gimp-print-plugin (#243593)
+
 * Thu May 31 2007 Nils Philippsen <nphilipp at redhat.com> - 2:2.2.15-1
 - version 2.2.15