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)