From 44f05a0e1f6d5940b5bd3888a265dac41830ad23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Villase=C3=B1or?= Date: Sat, 30 Oct 2010 17:45:46 +0000 Subject: Manually propagate the fix for CVE-2010-3711. --- libpurple/protocols/msn/slpcall.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libpurple/protocols/msn/slpcall.c b/libpurple/protocols/msn/slpcall.c index dbcacc7555..3dae90f344 100644 --- a/libpurple/protocols/msn/slpcall.c +++ b/libpurple/protocols/msn/slpcall.c @@ -527,7 +527,7 @@ got_sessionreq(MsnSlpCall *slpcall, const char *branch, 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); -- cgit v1.2.1