Fix memory leak and invalid vtable location on unload of m_sslinfo

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

diff --git a/src/modules/m_joinflood.cpp b/src/modules/m_joinflood.cpp
index 31d0b4e8483c276e098b4ab666abffc5c3233cd1..180d583769b864c30ec629f560022a4413c2f7bd 100644 (file)
--- a/src/modules/m_joinflood.cpp
+++ b/src/modules/m_joinflood.cpp
@@ -86,7 +86,7 @@ class joinfloodsettings : public classbase
 class JoinFlood : public ModeHandler
 {
  public:
-       JoinFlood(InspIRCd* Instance) : ModeHandler(Instance, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { }
+       JoinFlood(InspIRCd* Instance, Module* Creator) : ModeHandler(Instance, Creator, 'j', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
        ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
        {
@@ -97,7 +97,7 @@ class JoinFlood : public ModeHandler
                        return std::make_pair(false, parameter);
        }
 
-       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)
        {
                joinfloodsettings* dummy;
 
@@ -202,7 +202,7 @@ class ModuleJoinFlood : public Module
  public:
 
        ModuleJoinFlood(InspIRCd* Me)
-               : Module(Me), jf(Me)
+               : Module(Me), jf(Me, this)
        {
 
                if (!ServerInstance->Modes->AddMode(&jf))
@@ -211,7 +211,7 @@ class ModuleJoinFlood : public Module
                ServerInstance->Modules->Attach(eventlist, this, 3);
        }
 
-       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)
                {
@@ -221,11 +221,11 @@ class ModuleJoinFlood : public Module
                                if (f->islocked())
                                {
                                        user->WriteNumeric(609, "%s %s :This channel is temporarily unavailable (+j). Please try again later.",user->nick.c_str(),chan->name.c_str());
-                                       return 1;
+                                       return MOD_RES_DENY;
                                }
                        }
                }
-               return 0;
+               return MOD_RES_PASSTHRU;
        }
 
        virtual void OnUserJoin(User* user, Channel* channel, bool sync, bool &silent, bool created)