diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-27 20:22:16 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-09-27 20:22:16 +0100 |
| commit | f8cc6c3c93c57261377c4dc8c5658529f64e73d2 (patch) | |
| tree | e47453e4cdb23db8a8110aa1b8689a2875c2e5df /telepathy-glib/contacts-mixin.c | |
| parent | 20c611d373fddd647d76bee51710a6e0579c9fc1 (diff) | |
| download | telepathy-glib-f8cc6c3c93c57261377c4dc8c5658529f64e73d2.tar.gz | |
tp_contacts_mixin_get_contact_attributes: survive NULL strv arguments
Diffstat (limited to 'telepathy-glib/contacts-mixin.c')
| -rw-r--r-- | telepathy-glib/contacts-mixin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/telepathy-glib/contacts-mixin.c b/telepathy-glib/contacts-mixin.c index e73feafe1..4c9ab16b3 100644 --- a/telepathy-glib/contacts-mixin.c +++ b/telepathy-glib/contacts-mixin.c @@ -331,7 +331,7 @@ tp_contacts_mixin_get_contact_attributes (GObject *obj, */ tp_handles_ref (contact_repo, valid_handles); - for (i = 0; assumed_interfaces[i] != NULL; i++) + for (i = 0; assumed_interfaces != NULL && assumed_interfaces[i] != NULL; i++) { func = g_hash_table_lookup (self->priv->interfaces, assumed_interfaces[i]); @@ -342,7 +342,7 @@ tp_contacts_mixin_get_contact_attributes (GObject *obj, func (obj, valid_handles, result); } - for (i = 0; interfaces[i] != NULL; i++) + for (i = 0; interfaces != NULL && interfaces[i] != NULL; i++) { func = g_hash_table_lookup (self->priv->interfaces, interfaces[i]); |