rpms/gtk2/devel double-free.patch,NONE,1.1 gtk2.spec,1.260,1.261

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26784

Modified Files:
	gtk2.spec 
Added Files:
	double-free.patch 
Log Message:
Fix a double-free problem in gtk-update-icon-cache


double-free.patch:

--- NEW FILE double-free.patch ---
diff -up gtk+-2.12.0/gtk/updateiconcache.c.double-free gtk+-2.12.0/gtk/updateiconcache.c
--- gtk+-2.12.0/gtk/updateiconcache.c.double-free	2007-10-11 15:33:11.000000000 -0400
+++ gtk+-2.12.0/gtk/updateiconcache.c	2007-10-11 15:33:38.000000000 -0400
@@ -219,7 +219,6 @@ foreach_remove_func (gpointer key, gpoin
     {
       /* just a .icon file, throw away */
       g_free (key);
-      free_icon_data (image->icon_data);
       g_free (image);
 
       return TRUE;


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.260
retrieving revision 1.261
diff -u -r1.260 -r1.261
--- gtk2.spec	4 Oct 2007 12:59:57 -0000	1.260
+++ gtk2.spec	12 Oct 2007 04:23:50 -0000	1.261
@@ -16,7 +16,7 @@
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
 Name: gtk2
 Version: %{base_version}
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source: http://download.gnome.org/sources/gtk+/2.11/gtk+-%{version}.tar.bz2
@@ -37,6 +37,9 @@
 Patch6: simple-search-crash.patch
 Patch7: scale-button-grab.patch
 
+#
+Patch8: double-free.patch
+
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: glib2-devel >= %{glib2_version}
@@ -118,6 +121,7 @@
 %patch5 -p1 -b .swt-tooltips
 %patch6 -p0 -b .simple-search-crash
 %patch7 -p0 -b .scale-button-grab
+%patch8 -p1 -b .double-free
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -300,6 +304,9 @@
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Oct 11 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-6
+- Fix a double-free problem in gtk-update-icon-cache (#327711)
+
 * Thu Oct  4 2007 Matthias Clasen <mclasen at redhat.com> - 2.12.0-5
 - Fix a grab problem with multiple volume buttons