1 files changed, 9 insertions, 0 deletions
diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp
index 28dacc00888..e30f92bbde9 100644
--- a/src/server/game/Handlers/ChatHandler.cpp
+++ b/src/server/game/Handlers/ChatHandler.cpp
@@ -41,6 +41,7 @@
 #include "Util.h"
 #include "World.h"
 #include "WorldPacket.h"
+#include <utf8.h>
 #include <algorithm>
 
 inline bool isNasty(uint8 c)
@@ -258,6 +259,14 @@ void WorldSession::HandleMessagechatOpcode(WorldPacket& recvData)
                 return;
             }
 
+        // validate utf8
+        if (!utf8::is_valid(msg.begin(), msg.end()))
+        {
+            TC_LOG_ERROR("network", "Player %s (GUID: %u) sent a message containing an invalid UTF8 sequence - blocked", GetPlayer()->GetName().c_str(),
+                GetPlayer()->GetGUID().GetCounter());
+            return;
+        }
+        
         // collapse multiple spaces into one
         if (sWorld->getBoolConfig(CONFIG_CHAT_FAKE_MESSAGE_PREVENTING))
         {