adium.1-4: 252fb792: *** Plucked rev 894460d22c434e73d60b71ec...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 252fb792f5cf9ce9a9221900d135242c6e91a629
Parent:   998766ceb74c46b4d1e791c5152c38daa51f49f7
Author:   rekkanoryo at pidgin.im
Date:     08/21/10 20:16:46
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/252fb792f5cf9ce9a9221900d135242c6e91a629

Changelog: 

*** Plucked rev 894460d22c434e73d60b71ec031611988e687c8b (qulogic at pidgin.im):
Fix an MSN emoticon crash discovered by Pierre Nogu?s of Meta Security.

Pluck requested by rob-to86.

Changes against parent 998766ceb74c46b4d1e791c5152c38daa51f49f7

  patched  libpurple/protocols/msn/slp.c

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slp.c	d033671387f0b1b7be03a6b2d9ab0df77f87096c
+++ libpurple/protocols/msn/slp.c	ee38ce1a2bc2fdc1d45ab48dc83d6cf688eb27cf
@@ -930,6 +930,8 @@ msn_emoticon_msg(MsnCmdProc *cmdproc, Ms
 	conv = swboard->conv;
 
 	body = msn_message_get_bin_data(msg, &body_len);
+	if (!body || !body_len)
+		return;
 	body_str = g_strndup(body, body_len);
 
 	/* MSN Messenger 7 may send more than one MSNObject in a single message...