# HG changeset patch # User Stu Tomlinson # Date 1145112055 0 # Node ID 83ec59aefbe5ed4774578c89493850d8d519dc59 # Parent 293088b65dacb6f92f46f0b00b99ea59b0937089 [gaim-migrate @ 16035] Fix Coverity CID 109, if we get a topic for a channel that doesn't exist, there's no point continuing and trying to set that topic committer: Tailor Script diff -r 293088b65dac -r 83ec59aefbe5 src/protocols/irc/msgs.c --- a/src/protocols/irc/msgs.c Sat Apr 15 14:29:30 2006 +0000 +++ b/src/protocols/irc/msgs.c Sat Apr 15 14:40:55 2006 +0000 @@ -297,6 +297,12 @@ char *chan, *topic, *msg, *nick, *tmp, *tmp2; GaimConversation *convo; + convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, chan, irc->account); + if (!convo) { + gaim_debug(GAIM_DEBUG_ERROR, "irc", "Got a topic for %s, which doesn't exist\n", chan); + return; + } + if (!strcmp(name, "topic")) { chan = args[0]; topic = irc_mirc2txt (args[1]); @@ -305,11 +311,6 @@ topic = irc_mirc2txt (args[2]); } - convo = gaim_find_conversation_with_account(GAIM_CONV_TYPE_CHAT, chan, irc->account); - if (!convo) { - gaim_debug(GAIM_DEBUG_ERROR, "irc", "Got a topic for %s, which doesn't exist\n", chan); - } - /* If this is an interactive update, print it out */ tmp = g_markup_escape_text(topic, -1); tmp2 = gaim_markup_linkify(tmp);