GabbleVCardManager: don't expect that patched node exists in case of stream errors

20070919160536-01440-ab124aa632b9cdd91df3b53f613da7e6062da2e2.gz

1 files changed, 6 insertions, 3 deletions

diff --git a/src/vcard-manager.c b/src/vcard-manager.c
index c1067cc1a..ad3a8b1bb 100644
--- a/src/vcard-manager.c
+++ b/src/vcard-manager.c
@@ -876,12 +876,12 @@ replace_reply_cb (GabbleConnection *conn,
 
   DEBUG ("called: %s error", (error) ? "some" : "no");
 
-  g_assert (priv->patched_vcard != NULL);
-
   if (err)
     {
       /* We won't need our patched vcard after all */
-      lm_message_node_unref (priv->patched_vcard);
+      if (priv->patched_vcard != NULL)
+          lm_message_node_unref (priv->patched_vcard);
+
       priv->patched_vcard = NULL;
 
       node = NULL;
@@ -891,6 +891,9 @@ replace_reply_cb (GabbleConnection *conn,
       GabbleVCardCacheEntry *entry = cache_entry_get (manager,
           base->self_handle);
 
+      /* We must have patched vcard by now */
+      g_assert (priv->patched_vcard != NULL);
+
       /* Finally we may put the new vcard in the cache. */
       lm_message_node_unref (entry->vcard_node);
       entry->vcard_node = priv->patched_vcard;