Mercurial > pidgin.yaz
changeset 9776:1e5ef71c9583
[gaim-migrate @ 10644]
A patch from Daniel Atallah that should fix sf bug 1008489:
"Windows Messenger BOT Crashes Gaim"
Someone MSN-savvy should check this to make sure it's a valid fix.
committer: Tailor Script <tailor@pidgin.im>
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 19 Aug 2004 01:13:58 +0000 |
| parents | 4c1a1be8ce33 |
| children | 8d891252f2ac |
| files | src/protocols/msn/object.c src/protocols/msn/user.c |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/msn/object.c Thu Aug 19 01:06:34 2004 +0000 +++ b/src/protocols/msn/object.c Thu Aug 19 01:13:58 2004 +0000 @@ -76,6 +76,14 @@ GET_STRING_TAG(sha1d, "SHA1D"); GET_STRING_TAG(sha1c, "SHA1C"); + /* If we are missing any of the required elements then discard the object */ + if (obj->creator == NULL || obj->size == 0 || obj->type == 0 + || obj->location == NULL || obj->friendly == NULL + || obj->sha1d == NULL || obj->sha1c == NULL) { + msn_object_destroy(obj); + obj = NULL; + } + return obj; }
--- a/src/protocols/msn/user.c Thu Aug 19 01:06:34 2004 +0000 +++ b/src/protocols/msn/user.c Thu Aug 19 01:13:58 2004 +0000 @@ -285,7 +285,7 @@ user->msnobj = obj; - if (user->list_op & MSN_LIST_FL_OP) + if ((obj != NULL) && (user->list_op & MSN_LIST_FL_OP)) { /* TODO: I think we need better buddy icon core functions */ GaimAccount *account;