AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix a crash in icon handling

Browse Source 
The load_error was freed in two places.
Fix based on a patch in
https://bugzilla.gnome.org/show_bug.cgi?id=709967
This commit is contained in:
Matthias Clasen 2013-10-15 08:04:25 -04:00
parent 5a05d7e626
commit 3c41d4865e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkicontheme.c
View File

@ -3873,12 +3873,17 @@ gtk_icon_info_load_icon (GtkIconInfo *icon_info,
if (!icon_info_ensure_scale_and_pixbuf (icon_info, FALSE))
{
if (icon_info->load_error)
g_propagate_error (error, icon_info->load_error);
{
if (*error)
*error = g_error_copy (icon_info->load_error);
}
else
g_set_error_literal (error,
GTK_ICON_THEME_ERROR,
GTK_ICON_THEME_NOT_FOUND,
_("Failed to load icon"));
{
g_set_error_literal (error,
GTK_ICON_THEME_ERROR,
GTK_ICON_THEME_NOT_FOUND,
_("Failed to load icon"));
}
return NULL;
}