[Gaim-commits] CVS: gaim/src/protocols/msn slp.c,1.25,1.26

[Stu T. <nos...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/msn
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7759

Modified Files:
	slp.c 
Log Message:
Work around the MSN-7-somehow-related crash here too


Index: slp.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/slp.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -p -r1.25 -r1.26
--- slp.c	2 Apr 2005 16:38:33 -0000	1.25
+++ slp.c	28 Apr 2005 20:47:04 -0000	1.26
@@ -733,9 +733,17 @@ msn_p2p_msg(MsnCmdProc *cmdproc, MsnMess
 
 	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);