From ff9fa15c14b658be127d67faa1f50debf0716006 Mon Sep 17 00:00:00 2001 From: David Laban Date: Fri, 22 Jul 2011 02:28:15 -0400 Subject: [PATCH 4/6] presence-cache: don't crash if computed_hash == NULL [Necessary to fix #61433. -smcv] --- src/presence-cache.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/presence-cache.c b/src/presence-cache.c index 31eae07..cda913c 100644 --- a/src/presence-cache.c +++ b/src/presence-cache.c @@ -1314,7 +1314,13 @@ _caps_disco_cb (GabbleDisco *disco, computed_hash = caps_hash_compute_from_lm_node (query_result); - if (g_str_equal (waiter_self->ver, computed_hash)) + if (computed_hash == NULL) + { + DEBUG ("Unable to compute caps hash for '%s'.", jid); + trust = 0; + bad_hash = TRUE; + } + else if (g_str_equal (waiter_self->ver, computed_hash)) { trust = capability_info_recvd (cache, node, handle, cap_set, CAPABILITY_BUNDLE_ENOUGH_TRUST, client_types); -- 1.7.10.4