diff --git a/gio/ChangeLog b/gio/ChangeLog
index 576533abd..a5e3f6608 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-10  Michael Natterer  <mitch@imendio.com>
+
+	* gcontenttype.c (g_content_type_get_icon): fix SEGV by not using
+	uninitialized memory as array index.
+
 2008-06-10  Tor Lillqvist  <tml@novell.com>
 
 	* gcontenttype.c (g_content_type_can_be_executable)
diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
index 1ac22cb21..617c523cc 100644
--- a/gio/gcontenttype.c
+++ b/gio/gcontenttype.c
@@ -676,7 +676,7 @@ g_content_type_get_icon (const char *type)
   char *mimetype_icon, *generic_mimetype_icon, *q;
   char *xdg_mimetype_icon, *legacy_mimetype_icon;
   char *icon_names[4];
-  int n;
+  int n = 0;
   const char *p;
   GIcon *themed_icon;