Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-15 23:20:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Chat: Fix chat filter to not block certain non-ASCII characters

Browse Source 
(cherry picked from commit b4258ca4d9)
This commit is contained in:
Treeston
2018-09-18 16:55:58 +02:00
committed by Shauren
parent 0d7d41ed4f
commit b321d05386
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/server/game/Handlers/ChatHandler.cpp
View File

@@ -43,25 +43,30 @@
#include "WorldPacket.h"
#include <algorithm>
inline bool isNasty(char c)
inline bool isNasty(uint8 c)
{
if (c < 32) // all of these are control characters
return true;
if (c == 127) // ascii delete
return true;
if (uint8(c) == 255) // non-breaking whitespace
if (c == '\t')
return false;
if (c <= '\037') // ASCII control block
return true;
return false;
}
inline bool ValidateMessage(Player const* player, std::string& msg)
{
// cut at the first newline or carriage return
std::string::size_type pos = msg.find_first_of("\n\r");
if (pos == 0)
return false;
else if (pos != std::string::npos)
msg.erase(pos);
// abort on any sort of nasty character
for (char c : msg)
for (uint8 c : msg)
{
if (isNasty(c))
{
TC_LOG_ERROR("network", "Player %s (%s) sent a message containing control character %u - blocked", player->GetName().c_str(),
TC_LOG_ERROR("network", "Player %s (%s) sent a message containing invalid character %u - blocked", player->GetName().c_str(),
player->GetGUID().ToString().c_str(), uint32(c));
return false;
}