diff src/protocols/oscar/oscar.c @ 13664:4132d997ccec

[gaim-migrate @ 16066] Fix Coverity CID 45: Check to make sure a channel 2 ICBM actually contains an IP address TLV before attempting to use it. This avoids a crash when the server sends us an abnormal channel 2 ICBM. I'm not sure if that ever happens. Fix Coverity CID 204: Don't attempt to send data over a FLAP BOS connection that doesn't exist. This should never happen because the account should get disconnected first. Fix Coverity CID 205: Don't check that a variable 'od' which we know is valid is not equal to NULL in aim_search_address() in family_userlookup.c Fix Coverity CID 206: Don't check that the variable 'od' which we know is valid is not equal to NULL in aim_chat_join() in family_oservice.c Fix Coverity CID 207: I neglected to remove a "return;" line from aim_admin_setnick() in family_admin.c which caused setting your AIM screen name formatting to not work. Fix Coverity CID 208: Remove a duplicate call to gaim_connection_get_account() in peer_connection_propose() in peer.c. Fix Coverity CID 209: Remove the unused variable "username" from incomingim_chan2() in oscar.c. Fix Coverity CID 210: Remove the unused variable "account" from peer_connection_listen_cb() in peer.c. committer: Tailor Script <[e-mail]>

--- a/src/protocols/oscar/oscar.c	Wed Apr 19 05:50:50 2006 +0000
+++ b/src/protocols/oscar/oscar.c	Thu Apr 20 04:45:06 2006 +0000
@@ -1991,7 +1991,6 @@
 {
 	GaimConnection *gc;
 	GaimAccount *account;
-	const char *username = NULL;
 	char *message = NULL;
 
 	g_return_val_if_fail(od != NULL, 0);
@@ -2000,7 +1999,6 @@
 	gc = od->gc;
 	account = gaim_connection_get_account(gc);
 	od = gc->proto_data;
-	username = gaim_account_get_username(account);
 
 	if (args == NULL)
 		return 0;