From 1c9f6b8933989d1fa23147cffc83d9976b08e831 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 23 Sep 2011 15:32:58 -0500 Subject: Protect an external function better --- libdbusmenu-glib/client.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'libdbusmenu-glib/client.c') diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 24d5c5d..a98ae98 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -1578,7 +1578,11 @@ about_to_show_cb (GObject * proxy, GAsyncResult * res, gpointer userdata) void dbusmenu_client_send_about_to_show(DbusmenuClient * client, gint id, void (*cb)(gpointer data), gpointer cb_data) { + g_return_if_fail(DBUSMENU_CLIENT(client)); + g_return_if_fail(id > 0); + DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); + g_return_if_fail(priv != NULL); about_to_show_t * data = g_new0(about_to_show_t, 1); data->client = client; -- cgit v1.2.3 From 1de08ee692a68f7511e8096afde13cf8ae4217a1 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 23 Sep 2011 16:25:23 -0500 Subject: Protecting against NULL private areas --- libdbusmenu-glib/client.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libdbusmenu-glib/client.c') diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 24d5c5d..a51379f 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -1050,7 +1050,12 @@ menuproxy_build_cb (GObject * object, GAsyncResult * res, gpointer user_data) /* If this wasn't cancelled, we should be good */ DbusmenuClient * client = DBUSMENU_CLIENT(user_data); + /* But let's check */ + g_return_if_fail(client != NULL); DbusmenuClientPrivate * priv = DBUSMENU_CLIENT_GET_PRIVATE(client); + g_return_if_fail(priv != NULL); + + priv->menuproxy = proxy; if (priv->menuproxy_cancel != NULL) { -- cgit v1.2.3