Mercurial > pidgin.yaz

changeset 31323:555862567b38

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Manually propagate the fix for CVE-2010-3711.
author masca@cpw.pidgin.im
date Sat, 30 Oct 2010 17:45:46 +0000
parents c20f67f37d2b
children 734c5c08b5dd
files libpurple/protocols/msn/slpcall.c
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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);