From e29d5a655b02386c615bef866f73ffec052ceba3 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Mon, 19 Apr 2010 11:13:17 +0200 Subject: 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 file changed, 6 insertions(+) diff --git a/libempathy/empathy-dispatcher.c b/libempathy/empathy-dispatcher.c index 3cd8df40f..d0dbc6380 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); } -- cgit v1.2.3