diff options
| author | Ted Gould <ted@gould.cx> | 2011-09-29 14:41:43 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-29 14:41:43 -0500 |
| commit | c65db42a049223b3e4b5609551b54481978b880f (patch) | |
| tree | d83777cd0c1848387aca613a93c1015e7df4e26b /libdbusmenu-glib/client.c | |
| parent | 6a1d7639ea8ac4aa5ebdeb89e622b6244b625ab9 (diff) | |
| parent | 20ec3997c6cfbc160fa15d841ac477ccd5e23fd0 (diff) | |
| download | libdbusmenu-c65db42a049223b3e4b5609551b54481978b880f.tar.gz libdbusmenu-c65db42a049223b3e4b5609551b54481978b880f.tar.bz2 libdbusmenu-c65db42a049223b3e4b5609551b54481978b880f.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; |