From c8c572d9800ae20cb0a89fb666003213655704c8 Mon Sep 17 00:00:00 2001 From: Treeston Date: Thu, 10 Dec 2020 15:23:58 +0100 Subject: [PATCH] Game/ChatCommands: Make sure ChatHandler::extractPlayerTarget populates the strtok buffer for non-nullptr returns. Closes #25692, supersedes #25698. --- src/server/game/Chat/Chat.cpp | 4 ++++ 1 file changed, 4 insertions(+) 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)