From 502d8fc14bd14ddfc399eacdc9f95a95822ac404 Mon Sep 17 00:00:00 2001 From: "Amin.MasterkinG" Date: Fri, 26 Jul 2019 17:55:10 +0430 Subject: [PATCH] Fix client game crash with invite player to invalid name for Channel. (#2087) * Fix client game crash with invite player to invalid name for Channel. https://github.com/TrinityCore/TrinityCore/commit/7b8f294c024230451f82ff67150e11fc31b61293 https://github.com/TrinityCore/TrinityCore/issues/23215 * Change `#include ` to `#include "utf8.h"` --- src/server/game/Handlers/ChannelHandler.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/server/game/Handlers/ChannelHandler.cpp b/src/server/game/Handlers/ChannelHandler.cpp index 59fc409e1..81ebac075 100644 --- a/src/server/game/Handlers/ChannelHandler.cpp +++ b/src/server/game/Handlers/ChannelHandler.cpp @@ -9,6 +9,7 @@ #include "Player.h" #include +#include "utf8.h" void WorldSession::HandleJoinChannel(WorldPacket& recvPacket) { @@ -40,7 +41,7 @@ void WorldSession::HandleJoinChannel(WorldPacket& recvPacket) // pussywizard: restrict allowed characters in channel name to avoid |0 and possibly other exploits //if (!ObjectMgr::IsValidChannelName(channelName)) - if (channelName.find("|") != std::string::npos || channelName.size() >= 100) + if (channelName.find("|") != std::string::npos || channelName.size() >= 100 || !utf8::is_valid(channelName.begin(), channelName.end())) return; if (ChannelMgr* cMgr = ChannelMgr::forTeam(GetPlayer()->GetTeamId()))