Crash fixes from nenolod

[user/henk/code/inspircd.git] / src / commands / cmd_zline.cpp

diff --git a/src/commands/cmd_zline.cpp b/src/commands/cmd_zline.cpp
index a9f76a9328b286c1d6dcede0cf26411fae5d809e..c4bc750c70d0cea861d4f458f1d2db2f48fc5093 100644 (file)
--- a/src/commands/cmd_zline.cpp
+++ b/src/commands/cmd_zline.cpp
@@ -22,30 +22,32 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance)
        return new CommandZline(Instance);
 }
 
-CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
+CmdResult CommandZline::Handle (const char* const* parameters, int pcnt, User *user)
 {
+       std::string target = parameters[0];
+
        if (pcnt >= 3)
        {
-               if (strchr(parameters[0],'@') || strchr(parameters[0],'!'))
+               if (strchr(target.c_str(),'@') || strchr(target.c_str(),'!'))
                {
                        user->WriteServ("NOTICE %s :*** You cannot include a username or nickname in a zline, a zline must ban only an IP mask",user->nick);
                        return CMD_FAILURE;
                }
 
-               User *u = ServerInstance->FindNick(parameters[0]);
+               User *u = ServerInstance->FindNick(target.c_str());
                
                if (u)
                {
-                       parameters[0] = u->GetIPString();
+                       target = u->GetIPString();
                }
 
-               if (ServerInstance->IPMatchesEveryone(parameters[0],user))
+               if (ServerInstance->IPMatchesEveryone(target.c_str(),user))
                        return CMD_FAILURE;
 
                long duration = ServerInstance->Duration(parameters[1]);
 
-               const char* ipaddr = parameters[0];
-               User* find = ServerInstance->FindNick(parameters[0]);
+               const char* ipaddr = target.c_str();
+               User* find = ServerInstance->FindNick(target.c_str());
 
                if (find)
                {
@@ -65,12 +67,12 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
                {
                        if (!duration)
                        {
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,parameters[0]);
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent Z-line for %s.",user->nick,target.c_str());
                        }
                        else
                        {
                                time_t c_requires_crap = duration + ServerInstance->Time();
-                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,parameters[0],
+                               ServerInstance->SNO->WriteToSnoMask('x',"%s added timed Z-line for %s, expires on %s",user->nick,target.c_str(),
                                                ServerInstance->TimeString(c_requires_crap).c_str());
                        }
                        ServerInstance->XLines->ApplyLines();
@@ -78,18 +80,18 @@ CmdResult CommandZline::Handle (const char** parameters, int pcnt, User *user)
                else
                {
                        delete zl;
-                       user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,parameters[0]);
+                       user->WriteServ("NOTICE %s :*** Z-Line for %s already exists",user->nick,target.c_str());
                }
        }
        else
        {
-               if (ServerInstance->XLines->DelLine(parameters[0],"Z",user))
+               if (ServerInstance->XLines->DelLine(target.c_str(),"Z",user))
                {
-                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,parameters[0]);
+                       ServerInstance->SNO->WriteToSnoMask('x',"%s Removed Z-line on %s.",user->nick,target.c_str());
                }
                else
                {
-                       user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,parameters[0]);
+                       user->WriteServ("NOTICE %s :*** Z-Line %s not found in list, try /stats Z.",user->nick,target.c_str());
                        return CMD_FAILURE;
                }
        }