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

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

diff --git a/src/modules/m_cgiirc.cpp b/src/modules/m_cgiirc.cpp
index 3e00f498d9ed2dd621a853647dd3974706636580..4c1c35257de04c10805a4cd5e6ae2e715d0ed6e7 100644 (file)
--- a/src/modules/m_cgiirc.cpp
+++ b/src/modules/m_cgiirc.cpp
@@ -56,9 +56,9 @@ class CommandWebirc : public Command
                bool notify;
        public:
                CGIHostlist Hosts;
-               CommandWebirc(InspIRCd* Instance, bool bnotify) : Command(Instance, "WEBIRC", 0, 4, true), notify(bnotify)
+               CommandWebirc(InspIRCd* Instance, Module* Creator, bool bnotify)
+                       : Command(Instance, Creator, "WEBIRC", 0, 4, true), notify(bnotify)
                {
-                       this->source = "m_cgiirc.so";
                        this->syntax = "password client hostname ip";
                }
                CmdResult Handle(const std::vector<std::string> &parameters, User *user)
@@ -138,7 +138,7 @@ class ModuleCgiIRC : public Module
        CommandWebirc cmd;
        bool NotifyOpers;
 public:
-       ModuleCgiIRC(InspIRCd* Me) : Module(Me), cmd(Me, NotifyOpers)
+       ModuleCgiIRC(InspIRCd* Me) : Module(Me), cmd(Me, this, NotifyOpers)
        {
                OnRehash(NULL);
                ServerInstance->AddCommand(&cmd);
@@ -249,7 +249,7 @@ public:
        }
 
 
-       virtual int OnUserRegister(User* user)
+       virtual ModResult OnUserRegister(User* user)
        {
                for(CGIHostlist::iterator iter = cmd.Hosts.begin(); iter != cmd.Hosts.end(); iter++)
                {
@@ -282,10 +282,10 @@ public:
                                {
                                        // We don't need to do anything here
                                }
-                               return 0;
+                               return MOD_RES_PASSTHRU;
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void OnUserConnect(User* user)