httpd connection close fixes (these need to be backported to 1.1 at some point?)...

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

diff --git a/src/modules/m_alias.cpp b/src/modules/m_alias.cpp
index 2287210c6980eaac181324a2f70df955be025f5f..e0e4e647797aba3e1d8f2b5902f8094fd342bb28 100644 (file)
--- a/src/modules/m_alias.cpp
+++ b/src/modules/m_alias.cpp
@@ -74,8 +74,6 @@ class ModuleAlias : public Module
                : Module(Me)
        {
                ReadAliases();
-               pars.resize(MAXPARAMETERS);
-
                Me->Modules->Attach(I_OnPreCommand, this);
                Me->Modules->Attach(I_OnRehash, this);
 
@@ -247,16 +245,15 @@ class ModuleAlias : public Module
                SearchAndReplace(newline, "\r", "$");
 
                irc::tokenstream ss(newline);
+               pars.clear();
+               std::string command, token;
 
-               std::vector<std::string> parms;
-               ss.GetToken(pars[0]);
-               int x = 1;
-               while (ss.GetToken(pars[x]) && parms.size() <= MAXPARAMETERS)
+               ss.GetToken(command);
+               while (ss.GetToken(token) && (pars.size() <= MAXPARAMETERS))
                {
-                       parms.push_back(pars[x]);
-                       x++;
+                       pars.push_back(token);
                }
-               ServerInstance->Parser->CallHandler(pars[0], parms, user);
+               ServerInstance->Parser->CallHandler(command, pars, user);
        }
  
        virtual void OnRehash(User* user, const std::string &parameter)