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

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

diff --git a/src/modules/m_globops.cpp b/src/modules/m_globops.cpp
index 81aef9f5745f27c723d03acf47fa65b817f7e04e..4c8b0e713e54945cf6ccf66fc4bde4c88bb76a51 100644 (file)
--- a/src/modules/m_globops.cpp
+++ b/src/modules/m_globops.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
@@ -22,9 +22,8 @@
 class CommandGlobops : public Command
 {
  public:
-       CommandGlobops (InspIRCd* Instance) : Command(Instance,"GLOBOPS","o",1)
+       CommandGlobops (InspIRCd* Instance, Module* Creator) : Command(Instance, Creator,"GLOBOPS","o",1,1)
        {
-               this->source = "m_globops.so";
                syntax = "<any-text>";
                TRANSLATE2(TR_TEXT, TR_END);
        }
@@ -45,25 +44,24 @@ class CommandGlobops : public Command
 
 class ModuleGlobops : public Module
 {
-       CommandGlobops* mycommand;
+       CommandGlobops cmd;
  public:
        ModuleGlobops(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), cmd(Me, this)
        {
-               mycommand = new CommandGlobops(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
                ServerInstance->SNO->EnableSnomask('g',"GLOBOPS");
 
        }
-       
+
        virtual ~ModuleGlobops()
        {
                ServerInstance->SNO->DisableSnomask('g');
        }
-       
+
        virtual Version GetVersion()
        {
-               return Version(1, 2, 0, 1, VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("$Id$", VF_COMMON | VF_VENDOR, API_VERSION);
        }
 
 };