Attachment 86089 Details for Bug 69542 – 09/10] mcd_account_self_contact_upgraded_cb: don't crash on bad timing

[patch] 09/10] mcd_account_self_contact_upgraded_cb: don't crash on bad timing

0009-mcd_account_self_contact_upgraded_cb-don-t-crash-on-.patch (text/plain), 1.07 KB, created by Simon McVittie on 2013-09-18 18:49:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-18 18:49:16 UTC

Size: 1.07 KB

patch

obsolete

>From 9ea269e02f748396ccd810bf701c605bf59a90e1 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Wed, 18 Sep 2013 19:23:52 +0100
>Subject: [PATCH 09/10] mcd_account_self_contact_upgraded_cb: don't crash on
> bad timing
>
>If the account is disconnecting, we might get the callback for
>upgrading after we've already NULLed out self->priv->self_contact.
>---
> src/mcd-account.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
>diff --git a/src/mcd-account.c b/src/mcd-account.c
>index 52bad97..fb03638 100644
>--- a/src/mcd-account.c
>+++ b/src/mcd-account.c
>@@ -4925,6 +4925,11 @@ mcd_account_self_contact_upgraded_cb (GObject *source_object,
>               tp_contact_get_presence_message (self_contact),
>               self_contact);
>         }
>+      else if (self->priv->self_contact == NULL)
>+        {
>+          DEBUG ("self-contact '%s' has disappeared since we asked to "
>+              "upgrade it", tp_contact_get_identifier (self_contact));
>+        }
>       else
>         {
>           DEBUG ("self-contact '%s' has changed to '%s' since we asked to "
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 69542: 86081 | 86082 | 86083 | 86084 | 86085 | 86086 | 86087 | 86088 | 86089 | 86090

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.