mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-22 02:04:52 +01:00
[8378] Use exceptions instead of explicit size checking for each packet Author: arrai
CHECK_PACKET_SIZE was pretty error prone; once it was forgotten mangosd
could crash due to the asserts in ByteBuffer.h. That was exploitable by
malicious players.
Furthermore, there were duplicate checks: Additionally to
CHECK_PACKET_SIZE, the ByteBuffer assertions keept an eye
on not exceeding the packet boundaries - just to crash the server for
sure in such a case.
To prevent memory leaks or other undesirable states, please read in
every handler all variables _before_ doing any concrete handling.
--HG--
branch : trunk
This commit is contained in:
@@ -42,8 +42,6 @@
|
||||
|
||||
void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
|
||||
{
|
||||
CHECK_PACKET_SIZE(recv_data,4+4+1);
|
||||
|
||||
uint32 type;
|
||||
uint32 lang;
|
||||
|
||||
@@ -198,7 +196,6 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
|
||||
{
|
||||
std::string to, msg;
|
||||
recv_data >> to;
|
||||
CHECK_PACKET_SIZE(recv_data,4+4+(to.size()+1)+1);
|
||||
recv_data >> msg;
|
||||
|
||||
// strip invisible characters for non-addon messages
|
||||
@@ -496,9 +493,6 @@ void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
|
||||
std::string channel = "", msg = "";
|
||||
recv_data >> channel;
|
||||
|
||||
// recheck
|
||||
CHECK_PACKET_SIZE(recv_data,4+4+(channel.size()+1)+1);
|
||||
|
||||
recv_data >> msg;
|
||||
|
||||
// strip invisible characters for non-addon messages
|
||||
@@ -577,7 +571,6 @@ void WorldSession::HandleEmoteOpcode( WorldPacket & recv_data )
|
||||
{
|
||||
if(!GetPlayer()->isAlive())
|
||||
return;
|
||||
CHECK_PACKET_SIZE(recv_data,4);
|
||||
|
||||
uint32 emote;
|
||||
recv_data >> emote;
|
||||
@@ -628,8 +621,6 @@ void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data )
|
||||
return;
|
||||
}
|
||||
|
||||
CHECK_PACKET_SIZE(recv_data,4+4+8);
|
||||
|
||||
uint32 text_emote, emoteNum;
|
||||
uint64 guid;
|
||||
|
||||
@@ -679,8 +670,6 @@ void WorldSession::HandleTextEmoteOpcode( WorldPacket & recv_data )
|
||||
|
||||
void WorldSession::HandleChatIgnoredOpcode(WorldPacket& recv_data )
|
||||
{
|
||||
CHECK_PACKET_SIZE(recv_data, 8+1);
|
||||
|
||||
uint64 iguid;
|
||||
uint8 unk;
|
||||
//sLog.outDebug("WORLD: Received CMSG_CHAT_IGNORED");
|
||||
|
||||
Reference in New Issue
Block a user