diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-10 15:26:52 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-10 15:26:52 +0100 |
| commit | 1fbfb30038dbdda78f79533138fec05a270ea485 (patch) | |
| tree | 99565ecb1537bcf44b5b93a934e413d66b3e5b45 /telepathy-glib | |
| parent | 8e922eaeba7b7875b01697c4c1bac2df7e8ac1b9 (diff) | |
| parent | ba0b31b425d5871c4141ff0a7f477ec4e296e926 (diff) | |
| download | telepathy-glib-1fbfb30038dbdda78f79533138fec05a270ea485.tar.gz | |
Merge branch 'telepathy-glib-0.20'
Conflicts:
NEWS
Diffstat (limited to 'telepathy-glib')
| -rw-r--r-- | telepathy-glib/tls-certificate.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/telepathy-glib/tls-certificate.c b/telepathy-glib/tls-certificate.c index 2a2de5bdb..0f465d21c 100644 --- a/telepathy-glib/tls-certificate.c +++ b/telepathy-glib/tls-certificate.c @@ -250,7 +250,18 @@ tls_certificate_got_all_cb (TpProxy *proxy, cert_data = tp_asv_get_boxed (properties, "CertificateChainData", TP_ARRAY_TYPE_UCHAR_ARRAY_LIST); - g_assert (cert_data != NULL); + + if (cert_data == NULL) + { + GError e = { TP_DBUS_ERRORS, TP_DBUS_ERROR_INCONSISTENT, + "Missing CertificateChainData property" }; + + DEBUG ("Missing CertificateChainData property on %s", + tp_proxy_get_object_path (self)); + + tp_proxy_invalidate (proxy, &e); + return; + } self->priv->cert_data = g_ptr_array_new_with_free_func ( (GDestroyNotify) g_bytes_unref); |