# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1250841283 0
# Node ID adf7dc41770dbf7f2811a47f2133167d6a512cb9
# Parent  d4847cef4a843bf3397d41ee1fc86958673e3339# Parent  4d4e6adea7bc7e6f411cecf391cb7cfe2e0d10a9
merge of '5ca4fe18a853bb7a6d9c45cd96ce2e9da4a2f8b8'
     and '888e6ea856a320f298628491af64116f42f6aec6'

diff -r 4d4e6adea7bc -r adf7dc41770d COPYRIGHT
--- 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
diff -r 4d4e6adea7bc -r adf7dc41770d libpurple/protocols/jabber/buddy.c
--- 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);
+			}
 		}
 	}