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 542aedd41acf8b9ddc80e0cbaf4168b7e7479645..9bc0f362fb77d120d8291d1c3124d9f93e050361 100644 (file)
--- a/src/modules/m_messageflood.cpp
+++ b/src/modules/m_messageflood.cpp
@@ -200,17 +200,17 @@ class ModuleMsgFlood : public Module
        {
                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('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;
                        }
@@ -268,7 +265,7 @@ class ModuleMsgFlood : public Module
 
        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);
        }
 };