pidgin: a00585d3: Don't crash when the seemingly impossibl...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: a00585d31b07f9985bf449d58bdad8febeab2f2c
Ancestor: 5b8bc8dab93ef4b7764475ec085446f0d20e90e2
Author: darkrain42 at pidgin.im
Date: 2009-06-22T23:36:56
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/a00585d31b07f9985bf449d58bdad8febeab2f2c

Modified files:
        libpurple/protocols/jabber/caps.c

ChangeLog: 

Don't crash when the seemingly impossible occurs.

IOW, try to handle khc's crash, even though I don't see how this is possible.

(gdb) f 4
#4  0x00007f268bd61e11 in jabber_caps_ext_iqcb (js=0x2ac4700, 
    from=0x4a3c550 "maiku at jabber.org/Telepathy", type=JABBER_IQ_RESULT, 
    id=0x31b1240 "purpleb9d3d882", packet=0x55e3220, data=0x497d6f0)
    at caps.c:552
552             g_hash_table_insert(node_exts->exts, g_strdup(userdata->name), features);
(gdb) p node_exts
$2 = (JabberCapsNodeExts *) 0x0
(gdb) bt
#0  0x00007f2693f53fb5 in raise () from /lib/libc.so.6
#1  0x00007f2693f55bc3 in abort () from /lib/libc.so.6
#2  0x000000000049366b in sighandler (sig=11) at gtkmain.c:195
#3  <signal handler called>
#4  0x00007f268bd61e11 in jabber_caps_ext_iqcb (js=0x2ac4700, 
    from=0x4a3c550 "maiku at jabber.org/Telepathy", type=JABBER_IQ_RESULT, 
    id=0x31b1240 "purpleb9d3d882", packet=0x55e3220, data=0x497d6f0)
    at caps.c:552

#10 0x00007f268bd56d3d in jabber_parser_process (js=0x2ac4700, 
    buf=0x7f268bf7a980 "<iq from='maiku at jabber.org/Telepathy' to='khc at hxbc.us/Home' type='result' id='purpleb9d3d882'> <query node='http://telepathy.freedesktop.org/caps#voice-v1' xmlns='http://jabber.org/protocol/disco#info"..., len=279)
    at parser.c:227

$4 = (JabberCapsClientInfo *) 0x4a8bcd0
p *((ext_iq_data*)data)->data->info 
$6 = {
  identities = 0x0, 
  features = 0x4a41580, 
  forms = 0x0, 
  exts = 0x0, 
  tuple = {
    node = 0x3d2ff20 "http://telepathy.freedesktop.org/caps", 
    ver = 0x31aa850 "0.6.2.1", 
    hash = 0x0
  }
}


-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/caps.c	e8930893f67120841c0ccd8906ab583ed2941cf8
+++ libpurple/protocols/jabber/caps.c	6ad3c429ce91dd04b5534222a21f5772cb8d154d
@@ -534,6 +534,31 @@ jabber_caps_ext_iqcb(JabberStream *js, c
 		return;
 	}
 
+	node_exts = (userdata->data->info ? userdata->data->info->exts :
+	                                    userdata->data->node_exts);
+
+	/* TODO: I don't see how this can actually happen, but it crashed khc. */
+	if (!node_exts) {
+		purple_debug_error("jabber", "Couldn't find JabberCapsNodeExts. If you "
+				"see this, please tell darkrain42 and save your debug log.\n"
+				"JabberCapsClientInfo = %p\n", userdata->data->info);
+
+
+		/* Try once more to find the exts and then fail */
+		node_exts = jabber_caps_find_exts_by_node(userdata->data->node);
+		if (node_exts) {
+			purple_debug_info("jabber", "Found the exts on the second try.\n");
+			if (userdata->data->info)
+				userdata->data->info->exts = node_exts;
+			else
+				userdata->data->node_exts = node_exts;
+		} else {
+			cbplususerdata_unref(userdata->data);
+			g_free(userdata);
+			g_return_if_reached();
+		}
+	}
+
 	/* So, we decrement this after checking for an error, which means that
 	 * if there *is* an error, we'll never call the callback passed to
 	 * jabber_caps_get_info. We will still free all of our data, though.
@@ -547,8 +572,6 @@ jabber_caps_ext_iqcb(JabberStream *js, c
 			features = g_list_prepend(features, g_strdup(var));
 	}
 
-	node_exts = (userdata->data->info ? userdata->data->info->exts :
-	                                    userdata->data->node_exts);
 	g_hash_table_insert(node_exts->exts, g_strdup(userdata->name), features);
 	schedule_caps_save();