Mercurial > pidgin
comparison 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 <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 20 Apr 2006 04:45:06 +0000 |
parents | b198d0c26b83 |
children | e5c3bfc208a9 |
comparison
equal
deleted
inserted
replaced
13663:b76c6de0c3b5 | 13664:4132d997ccec |
---|---|
1989 static int | 1989 static int |
1990 incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo, IcbmArgsCh2 *args) | 1990 incomingim_chan2(OscarData *od, FlapConnection *conn, aim_userinfo_t *userinfo, IcbmArgsCh2 *args) |
1991 { | 1991 { |
1992 GaimConnection *gc; | 1992 GaimConnection *gc; |
1993 GaimAccount *account; | 1993 GaimAccount *account; |
1994 const char *username = NULL; | |
1995 char *message = NULL; | 1994 char *message = NULL; |
1996 | 1995 |
1997 g_return_val_if_fail(od != NULL, 0); | 1996 g_return_val_if_fail(od != NULL, 0); |
1998 g_return_val_if_fail(od->gc != NULL, 0); | 1997 g_return_val_if_fail(od->gc != NULL, 0); |
1999 | 1998 |
2000 gc = od->gc; | 1999 gc = od->gc; |
2001 account = gaim_connection_get_account(gc); | 2000 account = gaim_connection_get_account(gc); |
2002 od = gc->proto_data; | 2001 od = gc->proto_data; |
2003 username = gaim_account_get_username(account); | |
2004 | 2002 |
2005 if (args == NULL) | 2003 if (args == NULL) |
2006 return 0; | 2004 return 0; |
2007 | 2005 |
2008 gaim_debug_misc("oscar", "Incoming rendezvous message of type %u, " | 2006 gaim_debug_misc("oscar", "Incoming rendezvous message of type %u, " |