From 93202fe5ac36f495581f61649b2494cbc0bac7e7 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 12 May 2014 12:29:35 +0200 Subject: base-client: handle clients being NULL May happen if tp_base_client_dup_handled_channels() is called before any client has been registered. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=77882 Reviewed-by: Simon McVittie --- telepathy-glib/base-client.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c index 1643be178..767ddc2af 100644 --- a/telepathy-glib/base-client.c +++ b/telepathy-glib/base-client.c @@ -1062,9 +1062,11 @@ tp_base_client_dup_handled_channels (TpBaseClient *self) g_return_val_if_fail (self->priv->flags & CLIENT_IS_HANDLER, NULL); - set = g_hash_table_new (g_str_hash, g_str_equal); - clients = g_object_get_qdata (G_OBJECT (self->priv->dbus), clients_quark ()); + if (clients == NULL) + return NULL; + + set = g_hash_table_new (g_str_hash, g_str_equal); g_hash_table_iter_init (&iter, clients); while (g_hash_table_iter_next (&iter, NULL, &value)) -- cgit v1.2.1