From 5b12bfdad2c40923c48b7bafc1a0044032f6548b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= Date: Sun, 3 Jun 2007 20:44:10 +0000 Subject: [PATCH] Initialize unthemed_icon to NULL to avoid accessing uninitialized memory * gtk/gtkicontheme.c (choose_icon): Initialize unthemed_icon to NULL to avoid accessing uninitialized memory when gtk_icon_theme_choose_icon() is called with an empty names list. svn path=/trunk/; revision=18018 --- ChangeLog | 6 ++++++ gtk/gtkicontheme.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 336ac500b9..8a522f75c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-06-03 Torsten Schoenfeld + + * gtk/gtkicontheme.c (choose_icon): Initialize unthemed_icon to NULL + to avoid accessing uninitialized memory when + gtk_icon_theme_choose_icon() is called with an empty names list. + 2007-06-03 Richard Hult * gdk/quartz/gdkevents-quartz.c: (create_crossing_event): Set the key diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index d6accc94fe..d00e21916a 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -1234,7 +1234,7 @@ choose_icon (GtkIconTheme *icon_theme, GtkIconThemePrivate *priv; GList *l; GtkIconInfo *icon_info = NULL; - UnthemedIcon *unthemed_icon; + UnthemedIcon *unthemed_icon = NULL; gboolean allow_svg; gboolean use_builtin; gint i;