# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1255025681 0
# Node ID 33856dfb5cbf61c244372f05f223aea54784bfb0
# Parent  372f6b7b7f040d7abea8f12c63fd8a4a586b4590
Donot use a servconn if it's freed. Mark a leak.

diff -r 372f6b7b7f04 -r 33856dfb5cbf libpurple/protocols/msn/notification.c
--- a/libpurple/protocols/msn/notification.c	Thu Oct 08 18:12:06 2009 +0000
+++ b/libpurple/protocols/msn/notification.c	Thu Oct 08 18:14:41 2009 +0000
@@ -582,7 +582,7 @@
 
 	trans = msn_transaction_new(cmdproc, "FQY", "%d", payload_len);
 	msn_transaction_set_payload(trans, payload, payload_len);
-	msn_transaction_set_data(trans, data);
+	msn_transaction_set_data(trans, data);	/* XXX: 'data' leaks */
 	msn_cmdproc_send_trans(cmdproc, trans);
 }
 
diff -r 372f6b7b7f04 -r 33856dfb5cbf libpurple/protocols/msn/servconn.c
--- a/libpurple/protocols/msn/servconn.c	Thu Oct 08 18:12:06 2009 +0000
+++ b/libpurple/protocols/msn/servconn.c	Thu Oct 08 18:14:41 2009 +0000
@@ -440,11 +440,12 @@
 	memcpy(servconn->rx_buf + servconn->rx_len, buf, len + 1);
 	servconn->rx_len += len;
 
-	msn_servconn_process_data(servconn);
-	servconn_timeout_renew(servconn);
+	servconn = msn_servconn_process_data(servconn);
+	if (servconn)
+		servconn_timeout_renew(servconn);
 }
 
-void msn_servconn_process_data(MsnServConn *servconn)
+MsnServConn *msn_servconn_process_data(MsnServConn *servconn)
 {
 	char *cur, *end, *old_rx_buf;
 	int cur_len;
@@ -503,10 +504,13 @@
 
 	servconn->processing = FALSE;
 
-	if (servconn->wasted)
+	if (servconn->wasted) {
 		msn_servconn_destroy(servconn);
+		servconn = NULL;
+	}
 
 	g_free(old_rx_buf);
+	return servconn;
 }
 
 #if 0
diff -r 372f6b7b7f04 -r 33856dfb5cbf libpurple/protocols/msn/servconn.h
--- a/libpurple/protocols/msn/servconn.h	Thu Oct 08 18:12:06 2009 +0000
+++ b/libpurple/protocols/msn/servconn.h	Thu Oct 08 18:14:41 2009 +0000
@@ -178,8 +178,10 @@
  * data from the socket.
  *
  * @param servconn The servconn.
+ *
+ * @return @c NULL if servconn was destroyed, 'servconn' otherwise.
  */
-void msn_servconn_process_data(MsnServConn *servconn);
+MsnServConn *msn_servconn_process_data(MsnServConn *servconn);
 
 /**
  * Set a idle timeout fot this servconn