Mercurial > pidgin
changeset 26779:d387f1164b3a
merge of '9dd1c4c3db68a80dbf157a0c0bc0c723e42b7a6e'
and 'b786784e702c7cc7da7894e0de379cdaf56598c2'
| author | Ka-Hing Cheung <khc@hxbc.us> |
|---|---|
| date | Sat, 02 May 2009 19:14:07 +0000 |
| parents | a6724cd174f1 (diff) 93bf089e6233 (current diff) |
| children | 5c4a4a0f5929 5d4400b197d5 bf7b3cd5ed25 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/msn/slplink.c Sat May 02 18:42:53 2009 +0000 +++ b/libpurple/protocols/msn/slplink.c Sat May 02 19:14:07 2009 +0000 @@ -493,7 +493,7 @@ { MsnSlpMessage *slpmsg; const char *data; - gsize offset; + guint64 offset; gsize len; #ifdef MSN_DEBUG_SLP @@ -565,6 +565,7 @@ if (slpmsg->buffer == NULL) { purple_debug_error("msn", "Failed to allocate buffer for slpmsg\n"); + msn_slpmsg_destroy(slpmsg); return; } }