rpms/gdk-pixbuf/FC-2 gdk-pixbuf-0.22.0-bmpcrash.patch, NONE, 1.1 gdk-pixbuf.spec, 1.19, 1.20

[fedora-cvs-commits at redhat.com]

Update of /cvs/dist/rpms/gdk-pixbuf/FC-2
In directory cvs.devel.redhat.com:/tmp/cvs-serv7967

Modified Files:
	gdk-pixbuf.spec 
Added Files:
	gdk-pixbuf-0.22.0-bmpcrash.patch 
Log Message:
Fix a double free in the bmp loader


gdk-pixbuf-0.22.0-bmpcrash.patch:
 io-bmp.c |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE gdk-pixbuf-0.22.0-bmpcrash.patch ---
--- gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c.bmpcrash	2005-03-28 09:44:20.295820000 -0500
+++ gdk-pixbuf-0.22.0/gdk-pixbuf/io-bmp.c	2005-03-28 09:55:05.145324000 -0500
@@ -246,7 +246,14 @@
 static gboolean
 grow_buffer (struct bmp_progressive_state *State)
 {
-  guchar *tmp = realloc (State->buff, State->BufferSize);
+  guchar *tmp; 
+
+  if (State->BufferSize == 0) {
+    State->read_state = READ_STATE_ERROR;
+    return FALSE;
+  }
+
+  tmp = realloc (State->buff, State->BufferSize);
   if (!tmp) {
     State->read_state = READ_STATE_ERROR;
     return FALSE;


Index: gdk-pixbuf.spec
===================================================================
RCS file: /cvs/dist/rpms/gdk-pixbuf/FC-2/gdk-pixbuf.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- gdk-pixbuf.spec	15 Sep 2004 18:13:15 -0000	1.19
+++ gdk-pixbuf.spec	28 Mar 2005 15:11:12 -0000	1.20
@@ -1,6 +1,6 @@
 Name: gdk-pixbuf
 Version: 0.22.0
-Release: 11.3.5
+Release: 12.fc2
 Epoch: 1
 Summary: An image loading library used with GNOME.
 License: LGPL
@@ -30,6 +30,7 @@
 Patch8: gdk-pixbuf-0.22.0-bmploop.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=130711
 Patch9: gdk-pixbuf-0.22.0-loaders.patch
+Patch10: gdk-pixbuf-0.22.0-bmpcrash.patch
 
 URL: http://www.gnome.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -90,6 +91,7 @@
 %patch7 -p1 -b .underquoted
 %patch8 -p1 -b .bmploop
 %patch9 -p1 -b .loaders
+%patch10 -p1 -b .bmpcrash
 
 perl -p -i.bak -e 's/gmodule.h/gmodule-local.h/g; s/g_module/local_hack_g_module/g; s/GModule/LocalHackGModule/g; s/G_MODULE/LOCAL_HACK_G_MODULE/g' gdk-pixbuf/gdk-pixbuf-io.c gdk-pixbuf/gdk-pixbuf-io.h
 perl -pi -e 's/-static//g' gdk-pixbuf/local-hack-gmodule/Makefile
@@ -163,6 +165,9 @@
 %{_datadir}/gnome/html/*
 
 %changelog
+* Mon Mar 28 2005 Matthias Clasen <mclasen at redhat.com> - 1:0.22.0-12.fc2
+- Fix a double free in the bmp loader
+
 * Wed Sep 15 2004 Matthias Clasen <mclasen at redhat.com> - 1:0.22.0-11.3.5
 - Fix a bug in the last change which broke the xpm loader