soc.2010.msn-tlc: 4104dd38: Fix a crash when we want to remove a use...

masca at cpw.pidgin.im masca at cpw.pidgin.im
Sat Sep 18 17:00:26 EDT 2010


----------------------------------------------------------------------
Revision: 4104dd389a1599228a8276ea0ce723c4a8955952
Parent:   c66b7c91ca24bb848185f1d6b999f56af2cdf568
Author:   masca at cpw.pidgin.im
Date:     09/18/10 16:56:11
Branch:   im.pidgin.soc.2010.msn-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/4104dd389a1599228a8276ea0ce723c4a8955952

Changelog: 

Fix a crash when we want to remove a user that is not in the switchboard.

Changes against parent c66b7c91ca24bb848185f1d6b999f56af2cdf568

  patched  libpurple/protocols/msn/switchboard.c

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/switchboard.c	b69d8bd21b8a1bb725604805377991dd7c5bd0ff
+++ libpurple/protocols/msn/switchboard.c	f18d56f3ddf75f76758949e2d6469f736d3e3fd0
@@ -658,7 +658,10 @@ bye_cmd(MsnCmdProc *cmdproc, MsnCommand 
 		purple_conv_chat_remove_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL);
 
 		passport = g_list_find_custom(swboard->users, user, (GCompareFunc)strcmp);
-		g_free(passport->data);
+		if (passport)
+			g_free(passport->data);
+		else
+			purple_debug_warning("msn", "Can't find user %s in the switchboard\n", user);
 		swboard->users = g_list_delete_link(swboard->users, passport);
 		swboard->current_users--;
 		if (swboard->current_users == 0)


More information about the Commits mailing list