Attachment 62098 Details for Bug 50353 – check for null error on handle channels

check for null error on handle channels

0001-TpBaseClient-_tp_base_client_handle_channels-does-not-.txt (text/plain), 1.21 KB, created by Alban Browaeys on 2012-05-25 07:02:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alban Browaeys

Created: 2012-05-25 07:02:14 UTC

Size: 1.21 KB

patch

obsolete

>From 6f704c6c09f4ecb14fbc809a26fa11bf8ce6b85c Mon Sep 17 00:00:00 2001
>From: Alban Browaeys <prahal@yahoo.com>
>Date: Fri, 25 May 2012 15:59:31 +0200
>Subject: [PATCH] TpBaseClient: _tp_base_client_handle_channels does not check
> error for null
>
>icurrently empathy_tp_chat_new assert on TP_IS_ACCOUNT (account) . It
>looks like
>this is why I get a channel null and error null in
>_tp_base_client_handle_channels. But if channel is null the debug log
>derference error (and it is null here) for the message. Segfault ensue.
>This patch check for error being non null. Else it tells an assertion
>happened instead of error->message.
>---
> telepathy-glib/base-client.c |    2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/telepathy-glib/base-client.c b/telepathy-glib/base-client.c
>index bd4e2ed..c528c15 100644
>--- a/telepathy-glib/base-client.c
>+++ b/telepathy-glib/base-client.c
>@@ -2335,7 +2335,7 @@ _tp_base_client_handle_channels (TpSvcClientHandler *iface,
>           &error);
>       if (channel == NULL)
>         {
>-          DEBUG ("Failed to create TpChannel: %s", error->message);
>+          DEBUG ("Failed to create TpChannel: %s", (error)?error->message:"assert happend");
>           goto out;
>         }
> 
>-- 
>1.7.10
>

Actions: View

Attachments on bug 50353: 62098

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.