diff options
| author | Jorge Villaseñor <masca@cpw.pidgin.im> | 2010-10-30 17:45:46 +0000 |
|---|---|---|
| committer | Jorge Villaseñor <masca@cpw.pidgin.im> | 2010-10-30 17:45:46 +0000 |
| commit | 44f05a0e1f6d5940b5bd3888a265dac41830ad23 (patch) | |
| tree | 80ccdd1fb8c7843e1b3a8a3b28ee3ed045797ad4 | |
| parent | d3e179071c8c0cee5cfa5492071b7bc029dcfbc7 (diff) | |
| download | pidgin-soc.2010.msn-tlc.tar.gz | |
Manually propagate the fix for CVE-2010-3711.soc.2010.msn-tlc
| -rw-r--r-- | libpurple/protocols/msn/slpcall.c | 2 |
1 files changed, 1 insertions, 1 deletions
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); |