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

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

diff --git a/src/modules/m_redirect.cpp b/src/modules/m_redirect.cpp
index 1a5a48b00607578722ffdacc1286f1aad6cf6165..9d19b0cf07b68a90f53c0a295f465ae790c381b6 100644 (file)
--- a/src/modules/m_redirect.cpp
+++ b/src/modules/m_redirect.cpp
@@ -20,7 +20,7 @@
 class Redirect : public ModeHandler
 {
  public:
-       Redirect(InspIRCd* Instance) : ModeHandler(Instance, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       Redirect(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'L', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
        {
@@ -30,7 +30,7 @@ class Redirect : public ModeHandler
                        return std::make_pair(false, parameter);
        }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool server)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -44,7 +44,7 @@ class Redirect : public ModeHandler
                                }
                        }
 
-                       if (IS_LOCAL(source) && !IS_OPER(source) && !server)
+                       if (IS_LOCAL(source) && !IS_OPER(source))
                        {
                                Channel* c = ServerInstance->FindChan(parameter);
                                if (!c)
@@ -90,7 +90,7 @@ class ModuleRedirect : public Module
  public:
 
        ModuleRedirect(InspIRCd* Me)
-               : Module(Me), re(Me)
+               : Module(Me), re(Me, this)
        {
 
                if (!ServerInstance->Modes->AddMode(&re))
@@ -100,7 +100,7 @@ class ModuleRedirect : public Module
        }
 
 
-       virtual int OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
+       virtual ModResult OnUserPreJoin(User* user, Channel* chan, const char* cname, std::string &privs, const std::string &keygiven)
        {
                if (chan)
                {
@@ -116,16 +116,16 @@ class ModuleRedirect : public Module
                                        if (destchan && destchan->IsModeSet('L'))
                                        {
                                                user->WriteNumeric(470, "%s %s * :You may not join this channel. A redirect is set, but you may not be redirected as it is a circular loop.", user->nick.c_str(), cname);
-                                               return 1;
+                                               return MOD_RES_DENY;
                                        }
 
                                        user->WriteNumeric(470, "%s %s %s :You may not join this channel, so you are automatically being transferred to the redirect channel.", user->nick.c_str(), cname, channel.c_str());
                                        Channel::JoinUser(ServerInstance, user, channel.c_str(), false, "", false, ServerInstance->Time());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual ~ModuleRedirect()