Fix infinite loop on alias expansion, found by Adam

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

diff --git a/src/modules/m_messageflood.cpp b/src/modules/m_messageflood.cpp
index 611ff953f3b0c98eb281d7a689864c320af46bbf..9bc0f362fb77d120d8291d1c3124d9f93e050361 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -28,7 +28,7 @@ class floodsettings : public classbase
        time_t reset;
        std::map<User*,int> counters;
 
-       floodsettings(InspIRCd *Instance, bool a, int b, int c) : ServerInstance(Instance), ban(a), secs(b), lines(c)
+       floodsettings(bool a, int b, int c) : ban(a), secs(b), lines(c)
        {
                reset = ServerInstance->Time() + secs;
        };
@@ -77,7 +77,7 @@ class MsgFlood : public ModeHandler
 {
  public:
        SimpleExtItem<floodsettings> ext;
-       MsgFlood(InspIRCd* Instance, Module* Creator) : ModeHandler(Creator, 'f', PARAM_SETONLY, MODETYPE_CHANNEL),
+       MsgFlood(Module* Creator) : ModeHandler(Creator, "flood", 'f', PARAM_SETONLY, MODETYPE_CHANNEL),
                ext("messageflood", Creator) { }
 
        ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
@@ -137,7 +137,7 @@ class MsgFlood : public ModeHandler
                                        if (!f)
                                        {
                                                parameter = std::string(ban ? "*" : "") + ConvToStr(nlines) + ":" +ConvToStr(nsecs);
-                                               f = new floodsettings(ServerInstance,ban,nsecs,nlines);
+                                               f = new floodsettings(ban,nsecs,nlines);
                                                ext.set(channel, f);
                                                channel->SetModeParam('f', parameter);
                                                return MODEACTION_ALLOW;
@@ -155,7 +155,7 @@ class MsgFlood : public ModeHandler
                                                {
                                                        if ((((nlines != f->lines) || (nsecs != f->secs) || (ban != f->ban))) && (((nsecs > 0) && (nlines > 0))))
                                                        {
-                                                               floodsettings *fs = new floodsettings(ServerInstance,ban,nsecs,nlines);
+                                                               floodsettings *fs = new floodsettings(ban,nsecs,nlines);
                                                                ext.set(channel, fs);
                                                                channel->SetModeParam('f', parameter);
                                                                return MODEACTION_ALLOW;
@@ -195,22 +195,22 @@ class ModuleMsgFlood : public Module
 
  public:
 
-       ModuleMsgFlood(InspIRCd* Me)
-               : Module(Me), mf(Me, this)
+       ModuleMsgFlood()
+               : mf(this)
        {
                if (!ServerInstance->Modes->AddMode(&mf))
                        throw ModuleException("Could not add new modes!");
-               Extensible::Register(&mf.ext);
+               ServerInstance->Extensions.Register(&mf.ext);
                Implementation eventlist[] = { I_OnUserPreNotice, I_OnUserPreMessage };
                ServerInstance->Modules->Attach(eventlist, this, 2);
        }
 
        ModResult ProcessMessages(User* user,Channel* dest, const std::string &text)
        {
-               if (!IS_LOCAL(user) || (CHANOPS_EXEMPT(ServerInstance, 'f') && dest->GetPrefixValue(user) == OP_VALUE))
-               {
+               ModResult res;
+               FIRST_MOD_RESULT(OnChannelRestrictionApply, res, (user,dest,"flood"));
+               if (!IS_LOCAL(user) || res == MOD_RES_ALLOW)
                        return MOD_RES_PASSTHRU;
-               }
 
                floodsettings *f = mf.ext.get(dest);
                if (f)
@@ -234,10 +234,7 @@ class ModuleMsgFlood : public Module
                                char kickmessage[MAXBUF];
                                snprintf(kickmessage, MAXBUF, "Channel flood triggered (limit is %d lines in %d secs)", f->lines, f->secs);
 
-                               if (!dest->ServerKickUser(user, kickmessage))
-                               {
-                                       delete dest;
-                               }
+                               dest->ServerKickUser(user, kickmessage);
 
                                return MOD_RES_DENY;
                        }
@@ -264,12 +261,11 @@ class ModuleMsgFlood : public Module
 
        ~ModuleMsgFlood()
        {
-               ServerInstance->Modes->DelMode(&mf);
        }
 
        Version GetVersion()
        {
-               return Version("Provides channel mode +f (message flood protection)", VF_COMMON | VF_VENDOR, API_VERSION);
+               return Version("Provides channel mode +f (message flood protection)", VF_COMMON | VF_VENDOR);
        }
 };