telepathy-glib: contact-list: don't crash if 'd' is NULL

Guillaume Desmottes gdesmott at kemper.freedesktop.org
Mon May 26 05:11:00 PDT 2014


Module: telepathy-glib
Branch: master
Commit: ff81777b6176f5379a8c1f6152625f498757ddb1
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=ff81777b6176f5379a8c1f6152625f498757ddb1

Author: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
Date:   Wed May 21 10:47:23 2014 +0200

contact-list: don't crash if 'd' is NULL

https://bugs.freedesktop.org/show_bug.cgi?id=79006

---

 examples/cm/contactlist/contact-list.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/examples/cm/contactlist/contact-list.c b/examples/cm/contactlist/contact-list.c
index 36fa74f..a23d186 100644
--- a/examples/cm/contactlist/contact-list.c
+++ b/examples/cm/contactlist/contact-list.c
@@ -838,8 +838,12 @@ receive_auth_request (ExampleContactList *self,
       g_message ("From server: %s has cancelled their publish request",
           tp_handle_inspect (self->priv->contact_repo, contact));
 
-      d->publish = FALSE;
-      d->pre_approved = FALSE;
+      if (d)
+        {
+          d->publish = FALSE;
+          d->pre_approved = FALSE;
+        }
+
       g_hash_table_remove (self->priv->publish_requests,
           GUINT_TO_POINTER (contact));
       tp_handle_set_add (self->priv->cancelled_publish_requests, contact);



More information about the telepathy-commits mailing list