pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-14 15:41:30 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Tasks] Fix #task command crash on bad input (#2301)

Browse Source
This commit is contained in:
hg 2022-07-14 03:16:31 -04:00 committed by GitHub
parent 230d115195
commit 792ea1608a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
zone/gm_commands/task.cpp
View File

@ -175,7 +175,7 @@ void command_task(Client *c, const Seperator *sep)
} }
if (is_assign) { if (is_assign) {
auto task_id = std::stoul(sep->arg[2]); auto task_id = std::strtoul(sep->arg[2], nullptr, 10);
if (task_id && task_id < MAXTASKS) { if (task_id && task_id < MAXTASKS) {
target->AssignTask(task_id, 0, false); target->AssignTask(task_id, 0, false);
c->Message( c->Message(
@ -221,7 +221,7 @@ void command_task(Client *c, const Seperator *sep)
c->Message(Chat::Yellow, "Successfully reloaded task sets."); c->Message(Chat::Yellow, "Successfully reloaded task sets.");
return; return;
} else if (!strcasecmp(sep->arg[2], "task") && arguments == 3) { } else if (!strcasecmp(sep->arg[2], "task") && arguments == 3) {
int task_id = std::stoul(sep->arg[3]); int task_id = std::strtoul(sep->arg[3], nullptr, 10);
if (task_id && task_id < MAXTASKS) { if (task_id && task_id < MAXTASKS) {
c->Message( c->Message(
Chat::Yellow, Chat::Yellow,
@ -308,12 +308,12 @@ void command_task(Client *c, const Seperator *sep)
} }
} else if (is_update) { } else if (is_update) {
if (arguments >= 3) { if (arguments >= 3) {
auto task_id = std::stoul(sep->arg[2]); auto task_id = std::strtoul(sep->arg[2], nullptr, 10);
auto activity_id = std::stoul(sep->arg[3]); auto activity_id = std::strtoul(sep->arg[3], nullptr, 10);
int count = 1; int count = 1;
if (arguments >= 4) { if (arguments >= 4) {
count = std::stoi(sep->arg[4]); count = std::strtol(sep->arg[4], nullptr, 10);
if (count <= 0) { if (count <= 0) {
count = 1; count = 1;
} }