diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2020-12-10 15:23:58 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-05 01:02:18 +0100 |
| commit | 57f382d91c7f8abdbbd16b32554e9a5b318e806f (patch) | |
| tree | 32b6d7177834b00e151e999f0afd56d6aa37d953 | |
| parent | 8e4eaae9540f0bb628ad6a2ba8ee7d06244050f7 (diff) | |
Game/ChatCommands: Make sure ChatHandler::extractPlayerTarget populates the strtok buffer for non-nullptr returns. Closes #25692, supersedes #25698.
(cherry picked from commit c8c572d9800ae20cb0a89fb666003213655704c8)
| -rw-r--r-- | src/server/game/Chat/Chat.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index 59487cde650..b1b1a221c2f 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -585,6 +585,10 @@ bool ChatHandler::extractPlayerTarget(char* args, Player** player, ObjectGuid* p } else { + // populate strtok buffer to prevent crashes + static char dummy[1] = ""; + strtok(dummy, ""); + Player* pl = getSelectedPlayerOrSelf(); // if allowed player pointer if (player) |