Attachment 98907 Details for Bug 77882 – base-client: handle clients being NULL

[patch] base-client: handle clients being NULL

0005-base-client-handle-clients-being-NULL.patch (text/plain), 1.08 KB, created by Guillaume Desmottes on 2014-05-12 12:36:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guillaume Desmottes

Created: 2014-05-12 12:36:54 UTC

Size: 1.08 KB

patch

obsolete

>From ce7b8865ed5db25bdca780429f2191625b1ca79b Mon Sep 17 00:00:00 2001
>From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
>Date: Mon, 12 May 2014 12:29:35 +0200
>Subject: [PATCH 05/11] base-client: handle clients being NULL
>
>May happen if tp_base_client_dup_handled_channels() is called before any
>client has been registered.
>---
> 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 707ab55..fe72cb7 100644
>--- a/telepathy-glib/base-client.c
>+++ b/telepathy-glib/base-client.c
>@@ -1053,9 +1053,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))
>-- 
>1.9.0
>

Actions: View | Splinter Review

Attachments on bug 77882: 98903 | 98904 | 98905 | 98906 | 98907 | 98908 | 98909 | 98910 | 98911 | 98912 | 98913 | 98919 | 99023

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.