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

icon-theme: Add some preconditions for NULL arguments

Browse Source 
Related to this crash: https://bugzilla.gnome.org/show_bug.cgi?id=687967

https://bugzilla.gnome.org/show_bug.cgi?id=687977
This commit is contained in:
Stef Walter
2012-11-09 11:55:44 +01:00
parent e60c9219f1
commit c8de9abe98
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkicontheme.c
View File

@ -3318,6 +3318,7 @@ gtk_icon_info_load_symbolic (GtkIconInfo *icon_info,
gchar *icon_uri; gchar *icon_uri;
gboolean is_symbolic; gboolean is_symbolic;
g_return_val_if_fail (icon_info != NULL, NULL);
g_return_val_if_fail (fg != NULL, NULL); g_return_val_if_fail (fg != NULL, NULL);
icon_uri = NULL; icon_uri = NULL;
@ -3398,6 +3399,9 @@ gtk_icon_info_load_symbolic_for_context (GtkIconInfo *icon_info,
gchar *icon_uri; gchar *icon_uri;
gboolean is_symbolic; gboolean is_symbolic;
g_return_val_if_fail (icon_info != NULL, NULL);
g_return_val_if_fail (context != NULL, NULL);
icon_uri = NULL; icon_uri = NULL;
if (icon_info->icon_file) if (icon_info->icon_file)
icon_uri = g_file_get_uri (icon_info->icon_file); icon_uri = g_file_get_uri (icon_info->icon_file);
@ -3485,6 +3489,9 @@ gtk_icon_info_load_symbolic_for_style (GtkIconInfo *icon_info,
gchar *icon_uri; gchar *icon_uri;
gboolean is_symbolic; gboolean is_symbolic;
g_return_val_if_fail (icon_info != NULL, NULL);
g_return_val_if_fail (style != NULL, NULL);
icon_uri = NULL; icon_uri = NULL;
if (icon_info->icon_file) if (icon_info->icon_file)
icon_uri = g_file_get_uri (icon_info->icon_file); icon_uri = g_file_get_uri (icon_info->icon_file);