From f03389ffed8da78a4ae5b48473313fc75a522d44 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 12 May 2009 11:01:27 -0500 Subject: Checking parameter. Found by Cody Russell. --- libdbusmenu-glib/client.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 44312a8..b0b1157 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -486,6 +486,8 @@ dbusmenu_client_new (const gchar * name, const gchar * object) DbusmenuMenuitem * dbusmenu_client_get_root (DbusmenuClient * client) { + g_return_val_if_fail(DBUSMENU_IS_CLIENT(client), NULL); + DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); if (priv->layoutcall != NULL) { -- cgit v1.2.3 From f50b255c3993dd990606c1d17721788c4f4e1ef4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 12 May 2009 11:02:59 -0500 Subject: Checking incomming objects on the server --- libdbusmenu-glib/server.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libdbusmenu-glib/server.c b/libdbusmenu-glib/server.c index bb5bd8d..3db6db0 100644 --- a/libdbusmenu-glib/server.c +++ b/libdbusmenu-glib/server.c @@ -317,6 +317,9 @@ dbusmenu_server_new (const gchar * object) void dbusmenu_server_set_root (DbusmenuServer * self, DbusmenuMenuitem * root) { + g_return_if_fail(DBUSMENU_IS_SERVER(self)); + g_return_if_fail(DBUSMENU_IS_MENUITEM(root)); + g_debug("Setting root object: 0x%X", (unsigned int)root); GValue rootvalue = {0}; g_value_init(&rootvalue, G_TYPE_OBJECT); -- cgit v1.2.3 From 53b4a13ca4541bcdf85ca3ee28cb6ffc81e6f5b0 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 12 May 2009 11:07:00 -0500 Subject: Checking parameters on MI functions. --- libdbusmenu-glib/menuitem.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libdbusmenu-glib/menuitem.c b/libdbusmenu-glib/menuitem.c index 6360079..0894d2c 100644 --- a/libdbusmenu-glib/menuitem.c +++ b/libdbusmenu-glib/menuitem.c @@ -196,6 +196,8 @@ dbusmenu_menuitem_new_with_id (guint id) guint dbusmenu_menuitem_get_id (DbusmenuMenuitem * mi) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), 0); + GValue retval = {0}; g_value_init(&retval, G_TYPE_UINT); g_object_get_property(G_OBJECT(mi), "id", &retval); @@ -287,6 +289,9 @@ dbusmenu_menuitem_get_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * parent gboolean dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE); + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); + DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_append(priv->children, child); return TRUE; @@ -306,6 +311,9 @@ dbusmenu_menuitem_child_append (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) gboolean dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE); + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); + DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_remove(priv->children, child); return TRUE; @@ -326,6 +334,9 @@ dbusmenu_menuitem_child_delete (DbusmenuMenuitem * mi, DbusmenuMenuitem * child) gboolean dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * child, guint position) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), FALSE); + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(child), FALSE); + DbusmenuMenuitemPrivate * priv = DBUSMENU_MENUITEM_GET_PRIVATE(mi); priv->children = g_list_insert(priv->children, child, position); return TRUE; @@ -345,6 +356,8 @@ dbusmenu_menuitem_child_add_position (DbusmenuMenuitem * mi, DbusmenuMenuitem * DbusmenuMenuitem * dbusmenu_menuitem_child_find (DbusmenuMenuitem * mi, guint id) { + g_return_val_if_fail(DBUSMENU_IS_MENUITEM(mi), NULL); + GList * childs = dbusmenu_menuitem_get_children(mi); if (childs == NULL) return NULL; -- cgit v1.2.3