summaryrefslogtreecommitdiff
path: root/telepathy-glib/connection-contact-list.c
diff options
context:
space:
mode:
Diffstat (limited to 'telepathy-glib/connection-contact-list.c')
-rw-r--r--telepathy-glib/connection-contact-list.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/telepathy-glib/connection-contact-list.c b/telepathy-glib/connection-contact-list.c
index 4d53dfe7f..f00f2308c 100644
--- a/telepathy-glib/connection-contact-list.c
+++ b/telepathy-glib/connection-contact-list.c
@@ -255,6 +255,12 @@ got_contact_list_attributes_cb (TpConnection *self,
contact = tp_simple_client_factory_ensure_contact (
tp_proxy_get_factory (self), self, handle, id);
+
+ /* ensure_contact() can fail for obsolete CMs that don't have
+ * ImmortalHandles */
+ if (contact == NULL)
+ continue;
+
if (!_tp_contact_set_attributes (contact, value,
features->len, (TpContactFeature *) features->data, &e))
{