[Gaim-commits] SF.net SVN: gaim: [16032] trunk/src/protocols/msn

[<nos...@us...>]

Revision: 16032
Author:   nosnilmot
Date:     2006-04-15 06:39:26 -0700 (Sat, 15 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16032&view=rev

Log Message:
-----------
Fix Coverity CID 135, don't dereference before the NULL check

Modified Paths:
--------------
    trunk/src/protocols/msn/msn.c
    trunk/src/protocols/msn/session.c
Modified: trunk/src/protocols/msn/msn.c
===================================================================
--- trunk/src/protocols/msn/msn.c	2006-04-14 19:08:59 UTC (rev 16031)
+++ trunk/src/protocols/msn/msn.c	2006-04-15 13:39:26 UTC (rev 16032)
@@ -105,7 +105,7 @@
 	session = gc->proto_data;
 	swboard = msn_session_get_swboard(session, gaim_conversation_get_name(conv), MSN_SB_FLAG_IM);
 
-	if (session == NULL || swboard == NULL)
+	if (swboard == NULL)
 		return GAIM_CMD_RET_FAILED;
 
 	msn_switchboard_send_msg(swboard, msg, TRUE);

Modified: trunk/src/protocols/msn/session.c
===================================================================
--- trunk/src/protocols/msn/session.c	2006-04-14 19:08:59 UTC (rev 16031)
+++ trunk/src/protocols/msn/session.c	2006-04-15 13:39:26 UTC (rev 16032)
@@ -209,6 +209,8 @@
 {
 	MsnSwitchBoard *swboard;
 
+	g_return_val_if_fail(session != NULL, NULL);
+
 	swboard = msn_session_find_swboard(session, username);
 
 	if (swboard == NULL)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.