pidgin.2.5.6: 9615ee9f: *** Plucked rev 9dd1c4c3 (khc at pidgin.im)...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 9615ee9f13c70a0247317a319f4856557c3f348b
Ancestor: 49f94bb29abf4c87236751b580f99998ca5a80ba
Author: darkrain42 at pidgin.im
Date: 2009-05-02T21:09:37
Branch: im.pidgin.pidgin.2.5.6
URL: http://d.pidgin.im/viewmtn/revision/info/9615ee9f13c70a0247317a319f4856557c3f348b

Modified files:
        libpurple/protocols/msn/slplink.c

ChangeLog: 

*** Plucked rev 9dd1c4c3 (khc at pidgin.im):
Fixes a buffer overflow in the ZDI-08-054 report


-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slplink.c	f6e6ce8f90df7fe17c0c37810e37497a9372a212
+++ libpurple/protocols/msn/slplink.c	9e6b1889f6cd2f2925223509755d0bf65054c1cf
@@ -493,7 +493,7 @@ msn_slplink_process_msg(MsnSlpLink *slpl
 {
 	MsnSlpMessage *slpmsg;
 	const char *data;
-	gsize offset;
+	guint64 offset;
 	gsize len;
 
 #ifdef MSN_DEBUG_SLP
@@ -565,6 +565,7 @@ msn_slplink_process_msg(MsnSlpLink *slpl
 			if (slpmsg->buffer == NULL)
 			{
 				purple_debug_error("msn", "Failed to allocate buffer for slpmsg\n");
+				msn_slpmsg_destroy(slpmsg);
 				return;
 			}
 		}