[Gaim-commits] SF.net SVN: gaim: [16033] trunk/src/protocols/silc/silc.c

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

Revision: 16033
Author:   nosnilmot
Date:     2006-04-15 07:14:50 -0700 (Sat, 15 Apr 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16033&view=rev

Log Message:
-----------
Fix Coverity CID 119

Modified Paths:
--------------
    trunk/src/protocols/silc/silc.c
Modified: trunk/src/protocols/silc/silc.c
===================================================================
--- trunk/src/protocols/silc/silc.c	2006-04-15 13:39:26 UTC (rev 16032)
+++ trunk/src/protocols/silc/silc.c	2006-04-15 14:14:50 UTC (rev 16033)
@@ -1247,7 +1247,7 @@
 		const char *cmd, char **args, char **error, void *data)
 {
 	GaimConnection *gc;
-	GaimConversation *convo;
+	GaimConversation *convo = conv;
 	int id = 0;
 
 	gc = gaim_conversation_get_gc(conv);
@@ -1255,13 +1255,12 @@
 	if (gc == NULL)
 		return GAIM_CMD_RET_FAILED;
 
-	if(args && args[0]) {
+	if(args && args[0])
 		convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, args[0],
 									gc->account);
-	} else
-		convo = conv;
 
-	id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo));
+	if (convo != NULL)
+		id = gaim_conv_chat_get_id(GAIM_CONV_CHAT(convo));
 
 	if (id == 0)
 		return GAIM_CMD_RET_FAILED;


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