[telepathy-glib/telepathy-glib-0.8] tp_connection_manager_got_parameters: correctly return on error, rather than carrying on with a NULL pointer dereference

[Simon McVittie]

---
 telepathy-glib/connection-manager.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/telepathy-glib/connection-manager.c b/telepathy-glib/connection-manager.c
index 983da46..1b08972 100644
--- a/telepathy-glib/connection-manager.c
+++ b/telepathy-glib/connection-manager.c
@@ -408,7 +408,7 @@ tp_connection_manager_got_parameters (TpConnectionManager *self,
   if (error != NULL)
     {
       DEBUG ("Error getting params for %s, skipping it", protocol);
-      tp_connection_manager_continue_introspection (self);
+      goto out;
     }
 
    output = g_array_sized_new (TRUE, TRUE,
@@ -470,6 +470,7 @@ tp_connection_manager_got_parameters (TpConnectionManager *self,
       (TpConnectionManagerParam *) g_array_free (output, FALSE);
   g_ptr_array_add (self->priv->found_protocols, proto_struct);
 
+out:
   tp_connection_manager_continue_introspection (self);
 }
 
-- 
1.5.6.5