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

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

diff --git a/src/modules/m_satopic.cpp b/src/modules/m_satopic.cpp
index cf2cb3faa4373eb076823b1e134b318b95725fab..dfe1450512cbe56eb0d181162e02d855512f05e7 100644 (file)
--- a/src/modules/m_satopic.cpp
+++ b/src/modules/m_satopic.cpp
@@ -20,10 +20,9 @@
 class CommandSATopic : public Command
 {
  public:
-       CommandSATopic (InspIRCd* Instance)
-       : Command(Instance,"SATOPIC", "o", 2, 2, false, 0)
+       CommandSATopic (InspIRCd* Instance, Module* Creator)
+               : Command(Instance,Creator,"SATOPIC", "o", 2, 2, false, 0)
        {
-               this->source = "m_satopic.so";
                syntax = "<target> <topic>";
        }
 
@@ -40,7 +39,7 @@ class CommandSATopic : public Command
 
                        // 3rd parameter overrides access checks
                        target->SetTopic(user, newTopic, true);
-                       ServerInstance->SNO->WriteToSnoMask('A', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
+                       ServerInstance->SNO->WriteToSnoMask('a', user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
                        ServerInstance->PI->SendSNONotice("A", user->nick + " used SATOPIC on " + target->name + ", new topic: " + newTopic);
 
                        return CMD_LOCALONLY;
@@ -55,13 +54,12 @@ class CommandSATopic : public Command
 
 class ModuleSATopic : public Module
 {
-       CommandSATopic* mycommand;
+       CommandSATopic cmd;
  public:
        ModuleSATopic(InspIRCd* Me)
-       : Module(Me)
+       : Module(Me), cmd(Me, this)
        {
-               mycommand = new CommandSATopic(ServerInstance);
-               ServerInstance->AddCommand(mycommand);
+               ServerInstance->AddCommand(&cmd);
        }
 
        virtual ~ModuleSATopic()