# HG changeset patch # User Paul Aurich # Date 1245713816 0 # Node ID e3907cfaeb02ca963ffc5862be185ac4bbac1b45 # Parent 0405276c669876ea0a807676f50a86c0c294b982 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@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 #4 0x00007f268bd61e11 in jabber_caps_ext_iqcb (js=0x2ac4700, from=0x4a3c550 "maiku@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 " 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 @@ 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();