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 7ccd8188b3b1a301746cc98fb7a983e018fb44eb..678b9cc4952217e26840c2a3e5fbb21578cdd95b 100644 (file)
--- a/src/modules/m_invisible.cpp
+++ b/src/modules/m_invisible.cpp
@@ -18,39 +18,15 @@
 
 static ConfigReader* conf;
 
-class QuietOper : public VisData
-{
- public:
-       QuietOper()
-       {
-       }
-
-       virtual ~QuietOper()
-       {
-       }
-
-       virtual bool VisibleTo(User* user)
-       {
-               return IS_OPER(user);
-       }
-};
-
-
 class InvisibleMode : public ModeHandler
 {
-       QuietOper* qo;
  public:
        InvisibleMode(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'Q', 0, 0, false, MODETYPE_USER, true)
        {
-               qo = new QuietOper();
        }
 
        ~InvisibleMode()
        {
-               for (user_hash::iterator i = ServerInstance->Users->clientlist->begin(); i != ServerInstance->Users->clientlist->end(); i++)
-                       if (i->second->Visibility == qo)
-                               i->second->Visibility = NULL;
-               delete qo;
        }
 
        ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
@@ -66,9 +42,6 @@ class InvisibleMode : public ModeHandler
                        if (m && adding)
                                m->OnUserQuit(dest, "Connection closed", "Connection closed");
 
-                       /* Set visibility handler object */
-                       dest->Visibility = adding ? qo : NULL;
-
                        /* This has to come after setting/unsetting the handler */
                        if (m && !adding)
                                m->OnPostConnect(dest);
@@ -144,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()
@@ -155,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);
-       bool OnHostCycle(User* user);
-       /* No privmsg response when hiding - submitted by Eric at neowin */
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list);
-       /* Fix by Eric @ neowin.net, thanks :) -- Brain */
+       ModResult OnHostCycle(User* user);
+       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()
@@ -224,13 +199,13 @@ void ModuleInvisible::OnUserQuit(User* user, const std::string &reason, const st
        }
 }
 
-bool ModuleInvisible::OnHostCycle(User* user)
+ModResult ModuleInvisible::OnHostCycle(User* user)
 {
-       return user->IsModeSet('Q');
+       return user->IsModeSet('Q') ? MOD_RES_DENY : MOD_RES_PASSTHRU;
 }
 
 /* No privmsg response when hiding - submitted by Eric at neowin */
-int ModuleInvisible::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+ModResult ModuleInvisible::OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 {
        if ((target_type == TYPE_USER) && (IS_LOCAL(user)))
        {
@@ -238,13 +213,13 @@ int ModuleInvisible::OnUserPreNotice(User* user,void* dest,int target_type, std:
                if(target->IsModeSet('Q') && !IS_OPER(user))
                {
                        user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick.c_str(), target->nick.c_str());
-                       return 1;
+                       return MOD_RES_DENY;
                }
        }
-       return 0;
+       return MOD_RES_PASSTHRU;
 }
 
-int ModuleInvisible::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+ModResult ModuleInvisible::OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
 {
        return OnUserPreNotice(user, dest, target_type, text, status, exempt_list);
 }
@@ -273,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)