diff options
author | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-11 13:04:13 +0000 |
---|---|---|
committer | w00t <w00t@e03df62e-2008-0410-955e-edbf42e46eb7> | 2008-02-11 13:04:13 +0000 |
commit | 04e8f8fd991804d38975f54ddd1879809bf94bac (patch) | |
tree | dc0d966955c948a4b9b588c8f2106e5226259c3d /src/commands/cmd_eline.cpp | |
parent | 539f90e026f2178cc53d15c7d2fc9afe8fd48b1d (diff) |
Fix trampling on memory in Z/G/K/ELine.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@8901 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src/commands/cmd_eline.cpp')
-rw-r--r-- | src/commands/cmd_eline.cpp | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/commands/cmd_eline.cpp b/src/commands/cmd_eline.cpp index ca95955b7..5893fd9b7 100644 --- a/src/commands/cmd_eline.cpp +++ b/src/commands/cmd_eline.cpp @@ -24,19 +24,26 @@ extern "C" DllExport Command* init_command(InspIRCd* Instance) */ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user) { + std::string target = parameters[0]; + if (pcnt >= 3) { IdentHostPair ih; - User* find = ServerInstance->FindNick(parameters[0]); + User* find = ServerInstance->FindNick(target.c_str()); if (find) { ih.first = "*"; ih.second = find->GetIPString(); - std::string c = std::string("*@") + find->GetIPString(); - parameters[0] = c.c_str(); + target = std::string("*@") + find->GetIPString(); } else - ih = ServerInstance->XLines->IdentSplit(parameters[0]); + ih = ServerInstance->XLines->IdentSplit(target.c_str()); + + if (ih.first.empty()) + { + user->WriteServ("NOTICE %s :*** Target not found", user->nick); + return CMD_FAILURE; + } if (ServerInstance->HostMatchesEveryone(ih.first+"@"+ih.second,user)) return CMD_FAILURE; @@ -48,30 +55,30 @@ CmdResult CommandEline::Handle (const char** parameters, int pcnt, User *user) { if (!duration) { - ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,parameters[0]); + ServerInstance->SNO->WriteToSnoMask('x',"%s added permanent E-line for %s.",user->nick,target.c_str()); } else { time_t c_requires_crap = duration + ServerInstance->Time(); - ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s",user->nick,parameters[0], + ServerInstance->SNO->WriteToSnoMask('x',"%s added timed E-line for %s, expires on %s",user->nick,target.c_str(), ServerInstance->TimeString(c_requires_crap).c_str()); } } else { delete el; - user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** E-Line for %s already exists",user->nick,target.c_str()); } } else { - if (ServerInstance->XLines->DelLine(parameters[0], "E", user)) + if (ServerInstance->XLines->DelLine(target.c_str(), "E", user)) { - ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick,parameters[0]); + ServerInstance->SNO->WriteToSnoMask('x',"%s Removed E-line on %s.",user->nick,target.c_str()); } else { - user->WriteServ("NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick,parameters[0]); + user->WriteServ("NOTICE %s :*** E-Line %s not found in list, try /stats e.",user->nick,target.c_str()); } } |