Mercurial > pidgin
changeset 26746:934bc523239f
merge of '2448add898018349b64e4eb5550adb03644790db'
and '8ecad8981a627be745b45a1cd8e5e545f31d1395'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 28 Apr 2009 23:03:57 +0000 |
| parents | f1b92f2ea41f (diff) e5c874075b42 (current diff) |
| children | 7b0231e5c818 |
| files | |
| diffstat | 2 files changed, 7 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/family_chatnav.c Tue Apr 28 23:03:09 2009 +0000 +++ b/libpurple/protocols/oscar/family_chatnav.c Tue Apr 28 23:03:57 2009 +0000 @@ -44,6 +44,8 @@ if (snac2->family != SNAC_FAMILY_CHATNAV) { purple_debug_warning("oscar", "chatnav error: received response that maps to corrupt request (fam=%04x)\n", snac2->family); + g_free(snac2->data); + g_free(snac2); return 0; } @@ -462,6 +464,8 @@ if (snac2->family != SNAC_FAMILY_CHATNAV) { purple_debug_misc("oscar", "faim: chatnav_parse_info: received response that maps to corrupt request! (fam=%04x)\n", snac2->family); + g_free(snac2->data); + g_free(snac2); return 0; }
--- a/libpurple/protocols/oscar/family_locate.c Tue Apr 28 23:03:09 2009 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Tue Apr 28 23:03:57 2009 +0000 @@ -963,11 +963,14 @@ if ((snac2->family != SNAC_FAMILY_LOCATE) && (snac2->type != 0x0015)) { purple_debug_misc("oscar", "locate error: received response from invalid request! %d\n", snac2->family); + g_free(snac2->data); + g_free(snac2); return 0; } if (!(bn = snac2->data)) { purple_debug_misc("oscar", "locate error: received response from request without a buddy name!\n"); + g_free(snac2); return 0; }