Index: vfs-methods/fontilus/ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-control-center/vfs-methods/fontilus/ChangeLog,v
retrieving revision 1.90
diff -u -p -r1.90 ChangeLog
--- vfs-methods/fontilus/ChangeLog	23 Jul 2006 09:39:50 -0000	1.90
+++ vfs-methods/fontilus/ChangeLog	10 Dec 2006 18:33:15 -0000
@@ -1,3 +1,8 @@
+2006-12-10  Luca Cavalli  <lcavalli@cvs.gnome.org>
+
+	* font-method.c: (ensure_font_list): make sure the name list array
+	is NULL terminated. Fixes #356435.
+
 2006-07-23  Sebastien Bacher  <seb128@debian.org>
 
 	* font-method.directory.in: add encoding key, 
Index: vfs-methods/fontilus/font-method.c
===================================================================
RCS file: /cvs/gnome/gnome-control-center/vfs-methods/fontilus/font-method.c,v
retrieving revision 1.12
diff -u -p -r1.12 font-method.c
--- vfs-methods/fontilus/font-method.c	14 Nov 2005 15:29:27 -0000	1.12
+++ vfs-methods/fontilus/font-method.c	10 Dec 2006 18:33:16 -0000
@@ -171,8 +171,8 @@ ensure_font_list(void)
 	goto end;
     }
 
-    /* set up name list and hash */
-    font_names = g_new(gchar *, font_list->nfont);
+    /* set up name list and hash (name list array must be NULL terminated */
+    font_names = g_new0(gchar *, font_list->nfont + 1);
     font_hash = g_hash_table_new(g_str_hash, g_str_equal);
     for (i = 0; i < font_list->nfont; i++) {
 	font_names[i] = get_pango_name(font_list->fonts[i]);
