[telepathy-gabble/master] GabblePresenceCache: _process_caps: don't free uninitialized pointer if presence is NULL

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Aug 24 10:05:27 PDT 2009


---
 src/presence-cache.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/presence-cache.c b/src/presence-cache.c
index 4ab72ac..b68ee5b 100644
--- a/src/presence-cache.c
+++ b/src/presence-cache.c
@@ -1281,7 +1281,7 @@ _process_caps (GabblePresenceCache *cache,
   GSList *uris, *i;
   GabblePresenceCachePrivate *priv;
   GabblePresenceCapabilities old_caps = 0;
-  GabbleCapabilitySet *old_cap_set;
+  GabbleCapabilitySet *old_cap_set = NULL;
   guint serial;
   const gchar *hash, *ver;
 
@@ -1326,7 +1326,9 @@ _process_caps (GabblePresenceCache *cache,
           presence->caps, handle);
     }
 
-  gabble_capability_set_free (old_cap_set);
+  if (old_cap_set != NULL)
+    gabble_capability_set_free (old_cap_set);
+
   g_slist_free (uris);
 }
 
-- 
1.5.6.5




More information about the telepathy-commits mailing list