From e5319b0ad072ff0cb27a7999da96d63c2a14005f Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Fri, 12 Oct 2007 04:23:50 +0000
Subject: [PATCH] Fix a double-free problem in gtk-update-icon-cache

---
 double-free.patch | 11 +++++++++++
 gtk2.spec         |  9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 double-free.patch

diff --git a/double-free.patch b/double-free.patch
new file mode 100644
index 0000000..ca56512
--- /dev/null
+++ b/double-free.patch
@@ -0,0 +1,11 @@
+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;
diff --git a/gtk2.spec b/gtk2.spec
index e5fa314..7f71343 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -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 @@ Patch5: swt-tooltips.patch
 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 @@ docs for the GTK+ widget toolkit.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-2.0
 
 %changelog
+* Thu Oct 11 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.0-6
+- Fix a double-free problem in gtk-update-icon-cache (#327711)
+
 * Thu Oct  4 2007 Matthias Clasen <mclasen@redhat.com> - 2.12.0-5
 - Fix a grab problem with multiple volume buttons