# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1242079426 0
# Node ID 9612a2e8db870c0c946dc00146c76bdea5d1e3c6
# Parent  0402ec1872dc0a8ebbea57d4fd52ee10b2a79a70
Avoid an assertion failure when getting info on an AIM buddy. Thank to zac for pointing this out.

diff -r 0402ec1872dc -r 9612a2e8db87 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Sun May 10 23:41:06 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon May 11 22:03:46 2009 +0000
@@ -930,7 +930,7 @@
 	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 @@
 	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);