Mercurial > pidgin
changeset 28036:adf7dc41770d
merge of '5ca4fe18a853bb7a6d9c45cd96ce2e9da4a2f8b8'
and '888e6ea856a320f298628491af64116f42f6aec6'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Fri, 21 Aug 2009 07:54:43 +0000 |
| parents | d4847cef4a84 (diff) 4d4e6adea7bc (current diff) |
| children | d905474475dc 10540cd46121 |
| files | |
| diffstat | 2 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Fri Aug 21 07:03:48 2009 +0000 +++ b/COPYRIGHT Fri Aug 21 07:54:43 2009 +0000 @@ -88,6 +88,7 @@ Matěj Cepl Cerulean Studios, LLC Jonathan Champ +Matthew Chapman Christophe Chapuis Patrick Cheung Ka-Hing Cheung
--- a/libpurple/protocols/jabber/buddy.c Fri Aug 21 07:03:48 2009 +0000 +++ b/libpurple/protocols/jabber/buddy.c Fri Aug 21 07:54:43 2009 +0000 @@ -910,12 +910,14 @@ (binval = xmlnode_get_child(photo, "BINVAL"))) { gsize size; char *bintext = xmlnode_get_data(binval); - guchar *data = purple_base64_decode(bintext, &size); - g_free(bintext); + if (bintext) { + guchar *data = purple_base64_decode(bintext, &size); + g_free(bintext); - if (data) { - vcard_hash = jabber_calculate_data_sha1sum(data, size); - g_free(data); + if (data) { + vcard_hash = jabber_calculate_data_sha1sum(data, size); + g_free(data); + } } }