[empathy/gnome-2-30] empathy_dispatcher_chat_with_contact: check if connection_data is NULL



commit 9b3759d6a7c7ce4ec9c49cce1f7424270f19999d
Author: Guillaume Desmottes <guillaume desmottes collabora co uk>
Date:   Mon Apr 19 11:13:17 2010 +0200

    empathy_dispatcher_chat_with_contact: check if connection_data is NULL
    
    If the connection has been invalidated, it has been removed from
    priv->connections so we should check to avoid using a NULL pointer (#615970).

 libempathy/empathy-dispatcher.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
---
diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c
index 94d97cc..0f8474d 100644
--- a/libempathy/empathy-dispatcher.c
+++ b/libempathy/empathy-dispatcher.c
@@ -1423,6 +1423,11 @@ empathy_dispatcher_chat_with_contact (EmpathyContact *contact,
 
   connection = empathy_contact_get_connection (contact);
   connection_data = g_hash_table_lookup (priv->connections, connection);
+  if (connection_data == NULL)
+    {
+      /* Connection has been invalidated */
+      goto out;
+    }
 
   /* The contact handle might not be known yet */
   request_data = new_dispatcher_request_data (self, connection,
@@ -1435,6 +1440,7 @@ empathy_dispatcher_chat_with_contact (EmpathyContact *contact,
 
   dispatcher_request_channel (request_data);
 
+out:
   g_object_unref (self);
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]