diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-09-29 15:52:47 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-09-29 15:52:47 -0400 |
| commit | c53ad077b3b56443669047e5eb41d36b159bde66 (patch) | |
| tree | 6bb30d954d825dd7d635256735eb0b243e8f8995 /libdbusmenu-glib/client.c | |
| parent | b9a57897d1b62553d16ae44fef08801bfb053360 (diff) | |
| parent | dfccdc31ad648bd5f7e93eca258d2b0e879a6b71 (diff) | |
| download | libdbusmenu-c53ad077b3b56443669047e5eb41d36b159bde66.tar.gz libdbusmenu-c53ad077b3b56443669047e5eb41d36b159bde66.tar.bz2 libdbusmenu-c53ad077b3b56443669047e5eb41d36b159bde66.zip | |
* New upstream release.
* Protect functions against NULL results (LP: #757569, LP: #742909,
LP: #743050, LP: #743661)
Diffstat (limited to 'libdbusmenu-glib/client.c')
| -rw-r--r-- | libdbusmenu-glib/client.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c index 588c940..a7f4da5 100644 --- a/libdbusmenu-glib/client.c +++ b/libdbusmenu-glib/client.c @@ -1057,7 +1057,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) { @@ -1604,7 +1609,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; |