NEVER use the two-param assign unless you want your string padding to len bytes with \0!

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

diff --git a/src/modules/m_spanningtree/treesocket2.cpp b/src/modules/m_spanningtree/treesocket2.cpp
index 8700d57a28286d32089f0f4ac434305944ba0bae..5d2471b2cd1b8333d6243c0f4bbf6e2cb525a668 100644 (file)
--- a/src/modules/m_spanningtree/treesocket2.cpp
+++ b/src/modules/m_spanningtree/treesocket2.cpp
@@ -366,10 +366,8 @@ bool TreeSocket::ProcessLine(std::string &line)
                                User* user = Instance->FindNick(prefix);
                                if (user)
                                {
-                                       const char* ptrs[127];
-                                       for (size_t n = 0; (n < params.size()) && (n < 127); ++n)
-                                               ptrs[n] = params[n].c_str();
-                                       return Utils->Creator->HandleMap(ptrs, params.size(), user);
+                                       std::vector<std::string> p(params.begin(), params.end());
+                                       return Utils->Creator->HandleMap(p, user);
                                }
                        }
                        else if (command == "SERVER")
@@ -491,8 +489,9 @@ bool TreeSocket::ProcessLine(std::string &line)
                                if (params.size() >= 2)
                                {
                                        Instance->SNO->WriteToSnoMask(*(params[0].c_str()), "From " + (ServerSource ? ServerSource->GetName().c_str() : prefix) + ": "+ params[1]);
+                                       return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
                                }
-                               return Utils->DoOneToAllButSenderRaw(line, sourceserv, prefix, command, params);
+
                        }
                        else if (command == "BURST")
                        {
@@ -524,9 +523,7 @@ bool TreeSocket::ProcessLine(std::string &line)
                        else if (command == "MODE")
                        {
                                // Server-prefix MODE.
-                               const char* modelist[MAXPARAMETERS];
-                               for (size_t i = 0; i < params.size(); i++)
-                                       modelist[i] = params[i].c_str();
+                               std::vector<std::string> modelist(params.begin(), params.end());
 
                                /* We don't support this for channel mode changes any more! */
                                if (params.size() >= 1)
@@ -539,7 +536,7 @@ bool TreeSocket::ProcessLine(std::string &line)
                                }
                                        
                                // Insert into the parser
-                               this->Instance->SendMode(modelist, params.size(), this->Instance->FakeClient);
+                               this->Instance->SendMode(modelist, this->Instance->FakeClient);
                                
                                // Pass out to the network
                                return Utils->DoOneToAllButSenderRaw(line,sourceserv,prefix,command,params);
@@ -592,13 +589,9 @@ bool TreeSocket::ProcessLine(std::string &line)
                                }
                                        
                                // its a user
-                               const char* strparams[127];
-                               for (unsigned int q = 0; q < params.size(); q++)
-                               {
-                                       strparams[q] = params[q].c_str();
-                               }
+                               std::vector<std::string> strparams(params.begin(), params.end());
 
-                               switch (this->Instance->CallCommandHandler(command.c_str(), strparams, params.size(), who))
+                               switch (this->Instance->CallCommandHandler(command.c_str(), strparams, who))
                                {
                                        case CMD_INVALID:
                                                /*