m_dccallow Validate tokens before use

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

diff --git a/src/modules/m_namesx.cpp b/src/modules/m_namesx.cpp
index 2603b0ce5b5bbd0d04779d2e1299b25c5e704cf7..82d311773c2b52ba0d7ce14b50140e65efe868dd 100644 (file)
--- a/src/modules/m_namesx.cpp
+++ b/src/modules/m_namesx.cpp
@@ -30,9 +30,13 @@ class ModuleNamesX : public Module
  public:
        GenericCap cap;
        ModuleNamesX() : cap(this, "multi-prefix")
+       {
+       }
+
+       void init()
        {
                Implementation eventlist[] = { I_OnPreCommand, I_OnNamesListItem, I_On005Numeric, I_OnEvent, I_OnSendWhoLine };
-               ServerInstance->Modules->Attach(eventlist, this, 5);
+               ServerInstance->Modules->Attach(eventlist, this, sizeof(eventlist)/sizeof(Implementation));
        }
 
 
@@ -52,13 +56,12 @@ class ModuleNamesX : public Module
 
        ModResult OnPreCommand(std::string &command, std::vector<std::string> &parameters, LocalUser *user, bool validated, const std::string &original_line)
        {
-               irc::string c = command.c_str();
                /* We don't actually create a proper command handler class for PROTOCTL,
                 * because other modules might want to have PROTOCTL hooks too.
                 * Therefore, we just hook its as an unvalidated command therefore we
                 * can capture it even if it doesnt exist! :-)
                 */
-               if (c == "PROTOCTL")
+               if (command == "PROTOCTL")
                {
                        if ((parameters.size()) && (!strcasecmp(parameters[0].c_str(),"NAMESX")))
                        {
@@ -83,13 +86,16 @@ class ModuleNamesX : public Module
 
        void OnSendWhoLine(User* source, const std::vector<std::string>& params, User* user, std::string& line)
        {
-               if (!cap.ext.get(source) || line.empty())
+               if (!cap.ext.get(source))
                        return;
 
-               std::string::size_type pos = line.find(':');
-               if (pos == std::string::npos || pos < 2)
+               // Channel names can contain ":", and ":" as a 'start-of-token' delimiter is
+               // only ever valid after whitespace, so... find the actual delimiter first!
+               // Thanks to FxChiP for pointing this out.
+               std::string::size_type pos = line.find(" :");
+               if (pos == std::string::npos || pos == 0)
                        return;
-               pos -= 2;
+               pos--;
                // Don't do anything if the user has no prefixes
                if ((line[pos] == 'H') || (line[pos] == 'G') || (line[pos] == '*'))
                        return;
@@ -103,7 +109,7 @@ class ModuleNamesX : public Module
 
                // Try to find this channel
                std::string channame = line.substr(a, b-a);
-               Channel* chan = ServerInstance->FindChan(channame.c_str());
+               Channel* chan = ServerInstance->FindChan(channame);
                if (!chan)
                        return;