From b742c872223950dfae14468b0e7a304a3e660e76 Mon Sep 17 00:00:00 2001 From: ariel- Date: Sat, 28 Jan 2017 01:27:39 -0300 Subject: Core: add some missing Player Name normalization on input data (cherrypicked from 6f9e8b6c9174249025562faf9ad4c56bbb642547) --- src/server/game/Chat/Chat.cpp | 2 +- src/server/game/Handlers/CalendarHandler.cpp | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/server/game') diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp index ead2eb05498..2e2336f63da 100644 --- a/src/server/game/Chat/Chat.cpp +++ b/src/server/game/Chat/Chat.cpp @@ -1146,7 +1146,7 @@ bool ChatHandler::GetPlayerGroupAndGUIDByName(const char* cname, Player*& player { if (!normalizePlayerName(name)) { - PSendSysMessage(LANG_PLAYER_NOT_FOUND); + SendSysMessage(LANG_PLAYER_NOT_FOUND); SetSentErrorMessage(true); return false; } diff --git a/src/server/game/Handlers/CalendarHandler.cpp b/src/server/game/Handlers/CalendarHandler.cpp index 82dedefb997..cbc8de2b294 100644 --- a/src/server/game/Handlers/CalendarHandler.cpp +++ b/src/server/game/Handlers/CalendarHandler.cpp @@ -246,6 +246,9 @@ void WorldSession::HandleCalendarEventInvite(WorldPackets::Calendar::CalendarEve uint32 inviteeTeam = 0; ObjectGuid::LowType inviteeGuildId = UI64LIT(0); + if (!normalizePlayerName(calendarEventInvite.Name)) + return; + if (Player* player = ObjectAccessor::FindConnectedPlayerByName(calendarEventInvite.Name)) { // Invitee is online -- cgit v1.2.3