# HG changeset patch
# User Ka-Hing Cheung <khc@hxbc.us>
# Date 1241291647 0
# Node ID d387f1164b3a65cf954578891b309106b7f376b9
# Parent  a6724cd174f1c8a42fec7b62d945815c4b09517a# Parent  93bf089e623361c0420009429725a92a133fb336
merge of '9dd1c4c3db68a80dbf157a0c0bc0c723e42b7a6e'
     and 'b786784e702c7cc7da7894e0de379cdaf56598c2'

diff -r 93bf089e6233 -r d387f1164b3a libpurple/protocols/msn/slplink.c
--- a/libpurple/protocols/msn/slplink.c	Sat May 02 18:42:53 2009 +0000
+++ b/libpurple/protocols/msn/slplink.c	Sat May 02 19:14:07 2009 +0000
@@ -493,7 +493,7 @@
 {
 	MsnSlpMessage *slpmsg;
 	const char *data;
-	gsize offset;
+	guint64 offset;
 	gsize len;
 
 #ifdef MSN_DEBUG_SLP
@@ -565,6 +565,7 @@
 			if (slpmsg->buffer == NULL)
 			{
 				purple_debug_error("msn", "Failed to allocate buffer for slpmsg\n");
+				msn_slpmsg_destroy(slpmsg);
 				return;
 			}
 		}