summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-24 14:03:06 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-26 15:11:41 +0100
commit267bbbb6fe16b5d0e30f1dc446d93d9f833bc918 (patch)
tree5bc2a7ffe32c1ed46337fb8875c0a8d0d44a4c58
parenteefe5a1fc22c4ac9911a2fc7f16299c454ecebea (diff)
downloadtelepathy-glib-267bbbb6fe16b5d0e30f1dc446d93d9f833bc918.tar.gz
TpConnection: don't crash if a broken CM has no Groups property
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54500
-rw-r--r--telepathy-glib/connection-contact-list.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/telepathy-glib/connection-contact-list.c b/telepathy-glib/connection-contact-list.c
index f00f2308c..517481976 100644
--- a/telepathy-glib/connection-contact-list.c
+++ b/telepathy-glib/connection-contact-list.c
@@ -614,7 +614,7 @@ prepare_contact_groups_cb (TpProxy *proxy,
self->priv->contact_groups->len - 1);
groups = tp_asv_get_boxed (properties, "Groups", G_TYPE_STRV);
- for (iter = groups; *iter != NULL; iter++)
+ for (iter = groups; iter != NULL && *iter != NULL; iter++)
{
DEBUG (" %s", *iter);
g_ptr_array_add (self->priv->contact_groups, g_strdup (*iter));