ayatana-commits team mailing list archive

[Chris Coulson <chris.coulson@xxxxxxxxxxxxx>]

Chris Coulson has proposed merging lp:~chrisccoulson/dbusmenu/lp720895 into lp:dbusmenu.

Requested reviews:
  Ted Gould (ted)
Related bugs:
  #720895 bluetooth-applet crashed with SIGSEGV in g_variant_builder_add_value()
  https://bugs.launchpad.net/bugs/720895

For more details, see:
https://code.launchpad.net/~chrisccoulson/dbusmenu/lp720895/+merge/51594

Check the return value of gdk_keyval_name, as passing NULL pointers
to g_variant_builder_add can cause bad things to happen. Might fix LP: #720895
-- 
https://code.launchpad.net/~chrisccoulson/dbusmenu/lp720895/+merge/51594
Your team ayatana-commits is subscribed to branch lp:dbusmenu.

=== modified file 'libdbusmenu-gtk/menuitem.c'
--- libdbusmenu-gtk/menuitem.c	2011-02-21 16:04:44 +0000
+++ libdbusmenu-gtk/menuitem.c	2011-02-28 18:46:14 +0000
@@ -194,6 +194,7 @@
 	}
 
 	const gchar * keyname = gdk_keyval_name(key);
+	g_return_val_if_fail(keyname != NULL, FALSE);
 	g_variant_builder_add(&builder, "s", keyname);
 
 	GVariant * inside = g_variant_builder_end(&builder);