Mercurial > pidgin3 / file diff

--- a/libpurple/protocols/jabber/presence.c	Wed May 20 00:39:12 2009 +0000
+++ b/libpurple/protocols/jabber/presence.c	Wed May 20 15:59:04 2009 +0000
@@ -361,10 +361,10 @@
 		if ((nick = xmlnode_get_child(vcard, "NICKNAME"))) {
 			char *tmp = xmlnode_get_data(nick);
 			char *bare_jid = jabber_get_bare_jid(from);
-			if (strstr(bare_jid, tmp) == NULL) {
+			if (tmp && strstr(bare_jid, tmp) == NULL) {
 				g_free(nickname);
 				nickname = tmp;
-			} else
+			} else if (tmp)
 				g_free(tmp);
 
 			g_free(bare_jid);