aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-04-14 16:58:17 -0500
committerTed Gould <ted@gould.cx>2010-04-14 16:58:17 -0500
commita97cd5fdfba888c256b1bf0ec0fd28e869974281 (patch)
tree10bfa52fd7ef960a1c789ba0cc9b98b08bc2f0c7
parent19dfb9380fc86a873a30a8c748c78689a2bf6d33 (diff)
downloadlibdbusmenu-a97cd5fdfba888c256b1bf0ec0fd28e869974281.tar.gz
libdbusmenu-a97cd5fdfba888c256b1bf0ec0fd28e869974281.tar.bz2
libdbusmenu-a97cd5fdfba888c256b1bf0ec0fd28e869974281.zip
Return error if we can't find parent in a buildxml routine
-rw-r--r--libdbusmenu-glib/server.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c
index d87c024..02c9c57 100644
--- a/libdbusmenu-glib/server.c
+++ b/libdbusmenu-glib/server.c
@@ -404,6 +404,16 @@ _dbusmenu_server_get_layout (DbusmenuServer * server, gint parent, guint * revis
}
} else {
DbusmenuMenuitem * item = dbusmenu_menuitem_find_id(priv->root, parent);
+ if (item == NULL) {
+ if (error != NULL) {
+ g_set_error(error,
+ error_quark(),
+ INVALID_MENUITEM_ID,
+ "The ID supplied %d does not refer to a menu item we have",
+ parent);
+ }
+ return FALSE;
+ }
dbusmenu_menuitem_buildxml(item, xmlarray);
}
g_ptr_array_add(xmlarray, NULL);