# HG changeset patch # User Stu Tomlinson # Date 1145108366 0 # Node ID 8872789902a1ae46a260108016f0e97741148f9b # Parent c86c6f0505eac1945e5d390ab8bd81bfc0324fd6 [gaim-migrate @ 16032] Fix Coverity CID 135, don't dereference before the NULL check committer: Tailor Script diff -r c86c6f0505ea -r 8872789902a1 src/protocols/msn/msn.c --- a/src/protocols/msn/msn.c Fri Apr 14 19:08:59 2006 +0000 +++ b/src/protocols/msn/msn.c Sat Apr 15 13:39:26 2006 +0000 @@ -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); diff -r c86c6f0505ea -r 8872789902a1 src/protocols/msn/session.c --- a/src/protocols/msn/session.c Fri Apr 14 19:08:59 2006 +0000 +++ b/src/protocols/msn/session.c Sat Apr 15 13:39:26 2006 +0000 @@ -209,6 +209,8 @@ { MsnSwitchBoard *swboard; + g_return_val_if_fail(session != NULL, NULL); + swboard = msn_session_find_swboard(session, username); if (swboard == NULL)