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

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

diff --git a/src/modules/m_nokicks.cpp b/src/modules/m_nokicks.cpp
index ce43e576fc1a585efaef5af028fb31d63d4636e6..4af76e0d887a6f290e2cfb94a599cd109b893f03 100644 (file)
--- a/src/modules/m_nokicks.cpp
+++ b/src/modules/m_nokicks.cpp
@@ -18,7 +18,7 @@
 class NoKicks : public SimpleChannelModeHandler
 {
  public:
-       NoKicks(InspIRCd* Instance) : SimpleChannelModeHandler(Instance, 'Q') { }
+       NoKicks(InspIRCd* Instance, Module* Creator) : SimpleChannelModeHandler(Instance, Creator, 'Q') { }
 };
 
 class ModuleNoKicks : public Module
@@ -27,7 +27,7 @@ class ModuleNoKicks : public Module
 
  public:
        ModuleNoKicks(InspIRCd* Me)
-               : Module(Me), nk(Me)
+               : Module(Me), nk(Me, this)
        {
                if (!ServerInstance->Modes->AddMode(&nk))
                        throw ModuleException("Could not add new modes!");
@@ -40,26 +40,26 @@ class ModuleNoKicks : public Module
                ServerInstance->AddExtBanChar('Q');
        }
 
-       virtual int OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
+       virtual ModResult OnAccessCheck(User* source,User* dest,Channel* channel,int access_type)
        {
                if (access_type == AC_KICK)
                {
-                       if (channel->IsModeSet('Q') || channel->GetExtBanStatus(source, 'Q') < 0)
+                       if (!channel->GetExtBanStatus(source, 'Q').check(!channel->IsModeSet('Q')))
                        {
                                if ((ServerInstance->ULine(source->nick.c_str())) || (ServerInstance->ULine(source->server)) || (!*source->server))
                                {
                                        // ulines can still kick with +Q in place
-                                       return ACR_ALLOW;
+                                       return MOD_RES_PASSTHRU;
                                }
                                else
                                {
                                        // nobody else can (not even opers with override, and founders)
                                        source->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :Can't kick user %s from channel (+Q set)",source->nick.c_str(), channel->name.c_str(), dest->nick.c_str());
-                                       return ACR_DENY;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
-               return ACR_DEFAULT;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual ~ModuleNoKicks()