pidgin/pidgin

[gaim-migrate @ 16033]

2006-04-15, Stu Tomlinson
7f3119845b45
Parents dcbce56b7713
Children 4b26c6541540
[gaim-migrate @ 16033]
Fix Coverity CID 119
--- a/src/protocols/silc/silc.c Sat Apr 15 13:39:26 2006 +0000
+++ b/src/protocols/silc/silc.c Sat Apr 15 14:14:50 2006 +0000
@@ -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;