Fix segfault in m_chanprotect when OnAccessCheck is called with a null channel

[user/henk/code/inspircd.git] / src / modules / m_invisible.cpp

diff --git a/src/modules/m_invisible.cpp b/src/modules/m_invisible.cpp
index 1d8c8a38541e1285dfc68ab75d03a98b741ab5c0..678b9cc4952217e26840c2a3e5fbb21578cdd95b 100644 (file)
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -117,8 +117,11 @@ class ModuleInvisible : public Module
 
                /* Yeah i know people can take this out. I'm not about to obfuscate code just to be a pain in the ass. */
                ServerInstance->Users->ServerNoticeAll("*** m_invisible.so has just been loaded on this network. For more information, please visit http://inspircd.org/wiki/Modules/invisible");
-               Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserJoin, I_OnUserPart, I_OnUserQuit, I_OnRehash, I_OnHostCycle };
-               ServerInstance->Modules->Attach(eventlist, this, 7);
+               Implementation eventlist[] = {
+                       I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserJoin, I_OnUserPart, I_OnUserQuit,
+                       I_OnRehash, I_OnHostCycle, I_OnSendWhoLine
+               };
+               ServerInstance->Modules->Attach(eventlist, this, 8);
        };
 
        virtual ~ModuleInvisible()
@@ -128,17 +131,16 @@ class ModuleInvisible : public Module
                delete conf;
        };
 
-       virtual Version GetVersion();
-       virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created);
-       virtual void OnRehash(User* user);
+       Version GetVersion();
+       void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created);
+       void OnRehash(User* user);
        void OnUserPart(User* user, Channel* channel, std::string &partmessage, bool &silent);
        void OnUserQuit(User* user, const std::string &reason, const std::string &oper_message);
        ModResult OnHostCycle(User* user);
-       /* No privmsg response when hiding - submitted by Eric at neowin */
-       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
-       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
-       /* Fix by Eric @ neowin.net, thanks :) -- Brain */
+       ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
+       ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
        void WriteCommonFrom(User *user, Channel* channel, const char* text, ...) CUSTOM_PRINTF(4, 5);
+       void OnSendWhoLine(User* source, User* user, Channel* channel, std::string& line);
 };
 
 Version ModuleInvisible::GetVersion()
@@ -246,4 +248,10 @@ void ModuleInvisible::WriteCommonFrom(User *user, Channel* channel, const char*
        }
 }
 
+void ModuleInvisible::OnSendWhoLine(User* source, User* user, Channel* channel, std::string& line)
+{
+       if (user->IsModeSet('Q') && !IS_OPER(source))
+               line.clear();
+}
+
 MODULE_INIT(ModuleInvisible)