Fix a double-free problem in gtk-update-icon-cache

This commit is contained in:
Matthias Clasen 2007-10-12 04:23:50 +00:00
parent 8199b9934e
commit e5319b0ad0
2 changed files with 19 additions and 1 deletions

11
double-free.patch Normal file
View File

@ -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;

View File

@ -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