summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-07 17:15:39 +0100
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-11-07 17:15:43 +0100
commitc5615423317f2604498fb4bd2d7d3be02d06d31e (patch)
treea010764b47ca7f01814edfd0c22c07219c28a8c2
parent6e9c139d4a3b84e368d8f45592189d244fc59e32 (diff)
downloadtelepathy-glib-c5615423317f2604498fb4bd2d7d3be02d06d31e.tar.gz
channel-contacts: hash table may contain NULL contact
This is the case when joining a room containing members having an unknown owner. https://bugs.freedesktop.org/show_bug.cgi?id=42670
-rw-r--r--telepathy-glib/channel-contacts.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/telepathy-glib/channel-contacts.c b/telepathy-glib/channel-contacts.c
index 011733363..2146cf381 100644
--- a/telepathy-glib/channel-contacts.c
+++ b/telepathy-glib/channel-contacts.c
@@ -1093,7 +1093,12 @@ append_contacts (GPtrArray *contacts,
g_hash_table_iter_init (&iter, table);
while (g_hash_table_iter_next (&iter, NULL, &value))
- g_ptr_array_add (contacts, value);
+ {
+ if (value == NULL)
+ continue;
+
+ g_ptr_array_add (contacts, value);
+ }
}
void