# HG changeset patch
# User masca@cpw.pidgin.im
# Date 1288460746 0
# Node ID 555862567b38b955874636488cdbf2c1ff5483b9
# Parent  c20f67f37d2b6c7d2b7287a07d473d6367e3afd0
Manually propagate the fix for CVE-2010-3711.

diff -r c20f67f37d2b -r 555862567b38 libpurple/protocols/msn/slpcall.c
--- a/libpurple/protocols/msn/slpcall.c	Fri Oct 29 17:36:08 2010 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Sat Oct 30 17:45:46 2010 +0000
@@ -527,7 +527,7 @@
 							 slpcall->slplink->remote_user);
 
 		header = (MsnFileContext *)purple_base64_decode(context, &bin_len);
-		if (bin_len >= sizeof(MsnFileContext) - 1 &&
+		if (header != NULL && bin_len >= sizeof(MsnFileContext) - 1 &&
 			(header->version == 2 ||
 			 (header->version == 3 && header->length == sizeof(MsnFileContext) + 63))) {
 			file_size = GUINT64_FROM_LE(header->file_size);