# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1081919812 0
# Node ID 060171053a324370ce335668106ae103670b2385
# Parent  7dfd4b16c93734309bfd10168d1db7f8438e281a
[gaim-migrate @ 9413]
Patch by Nickolai Zeldovich to fix an infinite loop bug that sometimes
happens when MSN disconnects (closes patch #923500).

committer: Tailor Script <tailor@pidgin.im>

diff -r 7dfd4b16c937 -r 060171053a32 COPYRIGHT
--- a/COPYRIGHT	Wed Apr 14 04:10:26 2004 +0000
+++ b/COPYRIGHT	Wed Apr 14 05:16:52 2004 +0000
@@ -136,5 +136,6 @@
 Matt Wilson
 Ximian
 Jared Yanovich
+Nickolai Zeldovich
 Marco Ziech
 Jaroen Zwartepoorte
diff -r 7dfd4b16c937 -r 060171053a32 ChangeLog
--- a/ChangeLog	Wed Apr 14 04:10:26 2004 +0000
+++ b/ChangeLog	Wed Apr 14 05:16:52 2004 +0000
@@ -17,6 +17,8 @@
 	* MSN error reporting works again (Stu Tomlinson)
 	* MSN e-mail notifications should no longer cause Gaim to crash
 	  (Felipe Contreras)
+	* Fixed an infinite loop bug that would sometimes cause MSN to lock
+	  up (Nickolai Zeldovich)
 	* All away messages should now show up in tooltips
 	* Removing zephyr buddies no longer crashes (Arun A. Tharuvai)
 
diff -r 7dfd4b16c937 -r 060171053a32 src/protocols/msn/session.c
--- a/src/protocols/msn/session.c	Wed Apr 14 04:10:26 2004 +0000
+++ b/src/protocols/msn/session.c	Wed Apr 14 05:16:52 2004 +0000
@@ -65,7 +65,13 @@
 		msn_switchboard_destroy(session->switches->data);
 
 	while (session->lists.forward)
-		msn_user_destroy(session->lists.forward->data);
+	{
+		MsnUser *user = (MsnUser *)session->lists.forward->data;
+
+		msn_user_destroy(user);
+
+		session->lists.forward = g_slist_remove(session->lists.forward, user);
+	}
 
 	if (session->lists.allow != NULL)
 		g_slist_free(session->lists.allow);