pidgin: 49bc9af3: Avoid an assertion failure when getting ...

[darkrain42 at pidgin.im]

-----------------------------------------------------------------
Revision: 49bc9af35492c4f9b66f7233c77ec192432a00f0
Ancestor: 2b7afd5f3a168b013e5d3cd69999ffb6e0ee95a6
Author: darkrain42 at pidgin.im
Date: 2009-05-11T22:03:46
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/49bc9af35492c4f9b66f7233c77ec192432a00f0

Modified files:
        libpurple/protocols/oscar/oscar.c

ChangeLog: 

Avoid an assertion failure when getting info on an AIM buddy. Thank to zac for pointing this out.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/oscar.c	467fdaa45435cdcde7b5ee2c7806df8f484b5221
+++ libpurple/protocols/oscar/oscar.c	0cea4ff7eefc8f09a7a2e875a4057d43dfe48ed8
@@ -930,7 +930,7 @@ static void oscar_user_info_append_extra
 	PurpleGroup *g = NULL;
 	struct buddyinfo *bi = NULL;
 	char *tmp;
-	const char *bname, *gname = NULL;
+	const char *bname = NULL, *gname = NULL;
 
 	od = purple_connection_get_protocol_data(gc);
 	account = purple_connection_get_account(gc);
@@ -938,14 +938,14 @@ static void oscar_user_info_append_extra
 	if ((user_info == NULL) || ((b == NULL) && (userinfo == NULL)))
 		return;
 
-	bname = purple_buddy_get_name(b);
 	if (userinfo == NULL)
-		userinfo = aim_locate_finduserinfo(od, bname);
+		userinfo = aim_locate_finduserinfo(od, purple_buddy_get_name(b));
 
 	if (b == NULL)
 		b = purple_find_buddy(account, userinfo->bn);
 
 	if (b != NULL) {
+		bname = purple_buddy_get_name(b);
 		g = purple_buddy_get_group(b);
 		gname = purple_group_get_name(g);
 		presence = purple_buddy_get_presence(b);