# HG changeset patch
# User Christian Hammond <chipx86@chipx86.com>
# Date 1055707925 0
# Node ID 349204c9a709d5dbb8745a908e7d0ca2b2eb69da
# Parent  5baeb89ee2d44de0f6bbe791e811e4579f2aab90
[gaim-migrate @ 6331]
Sending MSN buddy icons back and forth no longer crashes. More checks in place
for bad things that can happen.

committer: Tailor Script <tailor@pidgin.im>

diff -r 5baeb89ee2d4 -r 349204c9a709 src/protocols/msn/servconn.c
--- a/src/protocols/msn/servconn.c	Sun Jun 15 19:57:23 2003 +0000
+++ b/src/protocols/msn/servconn.c	Sun Jun 15 20:12:05 2003 +0000
@@ -421,6 +421,7 @@
 msn_servconn_parse_data(gpointer data, gint source, GaimInputCondition cond)
 {
 	MsnServConn *servconn = (MsnServConn *)data;
+	MsnSession *session = servconn->session;
 	char buf[MSN_BUF_LEN];
 	gboolean cont = TRUE;
 	int len;
@@ -465,9 +466,18 @@
 
 			process_multi_line(servconn, msg);
 
-			servconn->msg_len = 0;
-			g_free(servconn->msg_passport);
-			g_free(servconn->msg_friendly);
+			if (g_list_find(session->servconns, servconn) != NULL) {
+				servconn->msg_len = 0;
+
+				if (servconn->msg_passport != NULL)
+					g_free(servconn->msg_passport);
+
+				if (servconn->msg_friendly != NULL)
+					g_free(servconn->msg_friendly);
+			}
+			else
+				cont = 0;
+
 			g_free(msg);
 		}
 		else {