From f4ae292123556074aa76141fa93f53921b0ea8d5 Mon Sep 17 00:00:00 2001 From: Treeston Date: Tue, 18 Sep 2018 17:11:25 +0200 Subject: Core/Chat: Validate UTF8 in chat messages (cherry picked from commit e5d63bc5b02d0427beb2adf5571a90e92ebc1721) --- src/server/game/Handlers/ChatHandler.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/server/game/Handlers/ChatHandler.cpp') diff --git a/src/server/game/Handlers/ChatHandler.cpp b/src/server/game/Handlers/ChatHandler.cpp index ede014c8f88..789bd461820 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 #include inline bool isNasty(uint8 c) @@ -72,6 +73,14 @@ inline bool ValidateMessage(Player const* player, std::string& msg) } } + // validate utf8 + if (!utf8::is_valid(msg.begin(), msg.end())) + { + TC_LOG_ERROR("network", "Player %s (%s) sent a message containing an invalid UTF8 sequence - blocked", player->GetName().c_str(), + player->GetGUID().ToString().c_str()); + return; + } + // collapse multiple spaces into one if (sWorld->getBoolConfig(CONFIG_CHAT_FAKE_MESSAGE_PREVENTING)) { -- cgit v1.2.3