Fix memory leak and invalid vtable location on unload of m_sslinfo

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

diff --git a/src/modules/m_deaf.cpp b/src/modules/m_deaf.cpp
index a291189fa537ff844b7c92da4f08c7e9bc590e49..aaa3696b5fc52b0887e2c31b972d638c2c9bdc04 100644 (file)
--- a/src/modules/m_deaf.cpp
+++ b/src/modules/m_deaf.cpp
@@ -20,9 +20,9 @@
 class User_d : public ModeHandler
 {
  public:
-       User_d(InspIRCd* Instance) : ModeHandler(Instance, 'd', 0, 0, false, MODETYPE_USER, false) { }
+       User_d(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'd', 0, 0, false, MODETYPE_USER, false) { }
 
-       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding, bool)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                if (adding)
                {
@@ -47,26 +47,25 @@ class User_d : public ModeHandler
 
 class ModuleDeaf : public Module
 {
-       User_d* m1;
+       User_d m1;
 
        std::string deaf_bypasschars;
        std::string deaf_bypasschars_uline;
 
  public:
        ModuleDeaf(InspIRCd* Me)
-               : Module(Me)
+               : Module(Me), m1(Me, this)
        {
-               m1 = new User_d(ServerInstance);
-               if (!ServerInstance->Modes->AddMode(m1))
+               if (!ServerInstance->Modes->AddMode(&m1))
                        throw ModuleException("Could not add new modes!");
 
-               OnRehash(NULL, "");
+               OnRehash(NULL);
                Implementation eventlist[] = { I_OnUserPreMessage, I_OnUserPreNotice, I_OnRehash, I_OnBuildExemptList };
                ServerInstance->Modules->Attach(eventlist, this, 4);
        }
 
 
-       virtual void OnRehash(User* user, const std::string&)
+       virtual void OnRehash(User* user)
        {
                ConfigReader* conf = new ConfigReader(ServerInstance);
                deaf_bypasschars = conf->ReadValue("deaf", "bypasschars", 0);
@@ -75,7 +74,7 @@ class ModuleDeaf : public Module
                delete conf;
        }
 
-       virtual int OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreNotice(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -84,10 +83,10 @@ class ModuleDeaf : public Module
                                this->BuildDeafList(MSG_NOTICE, chan, user, status, text, exempt_list);
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
-       virtual int OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
+       virtual ModResult OnUserPreMessage(User* user,void* dest,int target_type, std::string &text, char status, CUList &exempt_list)
        {
                if (target_type == TYPE_CHANNEL)
                {
@@ -96,7 +95,7 @@ class ModuleDeaf : public Module
                                this->BuildDeafList(MSG_PRIVMSG, chan, user, status, text, exempt_list);
                }
 
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void OnBuildExemptList(MessageType message_type, Channel* chan, User* sender, char status, CUList &exempt_list, const std::string &text)
@@ -159,8 +158,7 @@ class ModuleDeaf : public Module
 
        virtual ~ModuleDeaf()
        {
-               ServerInstance->Modes->DelMode(m1);
-               delete m1;
+               ServerInstance->Modes->DelMode(&m1);
        }
 
        virtual Version GetVersion()