summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Schönfeld <tsch@src.gnome.org>2007-06-03 20:44:10 +0000
committerTorsten Schönfeld <tsch@src.gnome.org>2007-06-03 20:44:10 +0000
commit5b12bfdad2c40923c48b7bafc1a0044032f6548b (patch)
tree5ba6524bae10c03fe06dcf208c59cb9c78b656a0
parent9daa2554b5e6807c53860a1d6c2333535f4502bd (diff)
downloadgdk-pixbuf-5b12bfdad2c40923c48b7bafc1a0044032f6548b.tar.gz
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
-rw-r--r--ChangeLog6
-rw-r--r--gtk/gtkicontheme.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 336ac500b..8a522f75c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-06-03 Torsten Schoenfeld <kaffeetisch@gmx.de>
+
+ * 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 <richard@imendio.com>
* gdk/quartz/gdkevents-quartz.c: (create_crossing_event): Set the key
diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c
index d6accc94f..d00e21916 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;