diff options
| author | Treeston <treeston.mmoc@gmail.com> | 2020-12-10 15:23:58 +0100 |
|---|---|---|
| committer | Treeston <treeston.mmoc@gmail.com> | 2020-12-10 15:23:58 +0100 |
| commit | c8c572d9800ae20cb0a89fb666003213655704c8 (patch) | |
| tree | cf37331a438bd47886e1f941ca7aab733fe87b1a | |
| parent | 0ab9f6bbca8edee062fad11d5ad1b3661bba0baa (diff) | |
Game/ChatCommands: Make sure ChatHandler::extractPlayerTarget populates the strtok buffer for non-nullptr returns. Closes #25692, supersedes #25698.
| -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 3839acf18bc..5b462589164 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -684,6 +684,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) |