From 57f382d91c7f8abdbbd16b32554e9a5b318e806f Mon Sep 17 00:00:00 2001
From: Treeston <treeston.mmoc@gmail.com>
Date: Thu, 10 Dec 2020 15:23:58 +0100
Subject: Game/ChatCommands: Make sure ChatHandler::extractPlayerTarget
 populates the strtok buffer for non-nullptr returns. Closes #25692,
 supersedes #25698.

(cherry picked from commit c8c572d9800ae20cb0a89fb666003213655704c8)
---
 src/server/game/Chat/Chat.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src')

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)
-- 
cgit v1.2.3