gaim/gaim

40afb8325ad9
Parents 588a4528305d
Children b441e9bf0035
I've been holding off working around this crash in the hope that I'd be
able to reproduce it and track down the real problem. I didn't manage to,
and if we're releasing soonish it's probably best to try and avoid crashing.
--- a/src/protocols/msn/slp.c Thu Apr 28 14:24:18 2005 -0400
+++ b/src/protocols/msn/slp.c Thu Apr 28 16:46:10 2005 -0400
@@ -733,9 +733,17 @@
if (slplink->swboard == NULL)
{
- /* We will need this in order to change it's flags. */
+ /* We will need this in order to change its flags. */
slplink->swboard = (MsnSwitchBoard *)cmdproc->data;
- slplink->swboard->slplink = slplink;
+ /* If swboard is NULL, something has probably gone wrong earlier on
+ * I didn't want to do this, but MSN 7 is somehow causing us to crash
+ * here, I couldn't reproduce it to debug more, and people are
+ * reporting bugs. Hopefully this doesn't cause more crashes. Stu.
+ */
+ if (slplink->swboard != NULL)
+ slplink->swboard->slplink = slplink;
+ else
+ gaim_debug_error("msn", "msn_p2p_msg, swboard is NULL, ouch!\n");
}
msn_slplink_process_msg(slplink, msg);