callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid double-free problems

Browse Source 
svn path=/trunk/; revision=18906
This commit is contained in:
Matthias Clasen
2007-10-12 04:31:04 +00:00
parent 2e74eec2f7
commit 030529e04b
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-10-12 Matthias Clasen <mclasne@redhat.com>
* gtk/updateiconcache.c: Avoid double-free problems by not
freeing data that may be cached elsewhere.
2007-10-10 Emmanuele Bassi <ebassi@gnome.org> 2007-10-10 Emmanuele Bassi <ebassi@gnome.org>
* gtk/gtkrecentmanager.c (gtk_recent_info_get_icon): Document * gtk/gtkrecentmanager.c (gtk_recent_info_get_icon): Document

8
gtk/updateiconcache.c
View File

@ -199,13 +199,6 @@ typedef struct
guint icon_data_size; guint icon_data_size;
} Image; } Image;
static void
free_icon_data (IconData *icon_data)
{
g_free (icon_data->attach_points);
g_strfreev (icon_data->display_names);
g_free (icon_data);
}
static gboolean static gboolean
foreach_remove_func (gpointer key, gpointer value, gpointer user_data) foreach_remove_func (gpointer key, gpointer value, gpointer user_data)
@ -219,7 +212,6 @@ foreach_remove_func (gpointer key, gpointer value, gpointer user_data)
{ {
/* just a .icon file, throw away */ /* just a .icon file, throw away */
g_free (key); g_free (key);
free_icon_data (image->icon_data);
g_free (image); g_free (image);
return TRUE; return TRUE;