Fix unsafe iteration in m_timedbans

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

diff --git a/src/modules/m_namedmodes.cpp b/src/modules/m_namedmodes.cpp
index 638d1d29c7cd8562b4a055e99ed890021549dd0c..020b1eb0a1d87340152e2011ac6ac2d54d958ed4 100644 (file)
--- a/src/modules/m_namedmodes.cpp
+++ b/src/modules/m_namedmodes.cpp
@@ -80,20 +80,31 @@ class CommandProp : public Command
        }
 };
 
+class DummyZ : public ModeHandler
+{
+ public:
+       DummyZ(Module* parent) : ModeHandler(parent, "namebase", 'Z', PARAM_ALWAYS, MODETYPE_CHANNEL)
+       {
+               list = true;
+       }
+};
+
 class ModuleNamedModes : public Module
 {
        CommandProp cmd;
+       DummyZ dummyZ;
  public:
-       ModuleNamedModes() : cmd(this)
+       ModuleNamedModes() : cmd(this), dummyZ(this)
        {
        }
 
        void init()
        {
                ServerInstance->Modules->AddService(cmd);
+               ServerInstance->Modules->AddService(dummyZ);
 
-               Implementation eventlist[] = { I_OnPreMode, I_On005Numeric };
-               ServerInstance->Modules->Attach(eventlist, this, 2);
+               Implementation eventlist[] = { I_OnPreMode };
+               ServerInstance->Modules->Attach(eventlist, this, 1);
        }
 
        Version GetVersion()
@@ -106,18 +117,6 @@ class ModuleNamedModes : public Module
                ServerInstance->Modules->SetPriority(this, I_OnPreMode, PRIORITY_FIRST);
        }
 
-       void On005Numeric(std::string& line)
-       {
-               std::string::size_type pos = line.find(" CHANMODES=");
-               if (pos != std::string::npos)
-               {
-                       pos += 11;
-                       while (line[pos] > 'A' && line[pos] < 'Z')
-                               pos++;
-                       line.insert(pos, 1, 'Z');
-               }
-       }
-
        ModResult OnPreMode(User* source, User* dest, Channel* channel, const std::vector<std::string>& parameters)
        {
                if (!channel)