From 06c26c4b05560a09f070930a03635650a3fba351 Mon Sep 17 00:00:00 2001
From: Yohann Ferreira <yohann_dot_ferreira_at_orange_dot_efer>
Date: Fri, 4 Nov 2011 18:25:33 +0100
Subject: Prevent a potential crash when the chat channel is wrong.

Reviewed-by: Erik Schilling
---
 src/net/manaserv/chathandler.cpp | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index 6c97fae3..efb156f0 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -255,7 +255,17 @@ void ChatHandler::handleChatMessage(Net::MessageIn &msg)
     std::string chatMsg = msg.readString();
 
     Channel *channel = channelManager->findById(channelId);
-    channel->getTab()->chatLog(userNick, chatMsg);
+    if (channel)
+    {
+        ChannelTab *tab = channel->getTab();
+        if (tab)
+            tab->chatLog(userNick, chatMsg);
+    }
+    else
+    {
+        // Can't find channel
+        logger->log("Couldn't find chat channel id: %hi", channelId);
+    }
 }
 
 void ChatHandler::handleQuitChannelResponse(Net::MessageIn &msg)
-- 
cgit v1.2.3-70-g09d2