mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-19 13:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8850] Check packet opcode for >= NUM_MSG_TYPES before queueing.

Browse source 
Also add check for wrong packet status requirement in code.
This commit is contained in:
XTZGZoReX 2009-11-20 20:11:39 +01:00
parent ab62a11d4e
commit 0011a41003
3 changed files with 86 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/game/WorldSession.cpp
View file

@ -169,14 +169,6 @@ bool WorldSession::Update(uint32 /*diff*/)
packet->GetOpcode()); packet->GetOpcode());
#endif*/ #endif*/
if(packet->GetOpcode() >= NUM_MSG_TYPES)
{
sLog.outError( "SESSION: received non-existed opcode %s (0x%.4X)",
LookupOpcodeName(packet->GetOpcode()),
packet->GetOpcode());
}
else
{
OpcodeHandler& opHandle = opcodeTable[packet->GetOpcode()]; OpcodeHandler& opHandle = opcodeTable[packet->GetOpcode()];
try try
{ {
@ -249,6 +241,11 @@ bool WorldSession::Update(uint32 /*diff*/)
LookupOpcodeName(packet->GetOpcode()), LookupOpcodeName(packet->GetOpcode()),
packet->GetOpcode()); packet->GetOpcode());
break; break;
default:
sLog.outError("SESSION: received wrong-status-req opcode %s (0x%.4X)",
LookupOpcodeName(packet->GetOpcode()),
packet->GetOpcode());
break;
} }
} }
catch(ByteBufferException &) catch(ByteBufferException &)
@ -261,7 +258,6 @@ bool WorldSession::Update(uint32 /*diff*/)
packet->hexlike(); packet->hexlike();
} }
} }
}
delete packet; delete packet;
} }

7
src/game/WorldSocket.cpp
View file

@ -659,6 +659,13 @@ int WorldSocket::ProcessIncoming (WorldPacket* new_pct)
const ACE_UINT16 opcode = new_pct->GetOpcode (); const ACE_UINT16 opcode = new_pct->GetOpcode ();
if (opcode >= NUM_MSG_TYPES)
{
sLog.outError( "SESSION: received non-existed opcode %s (0x%.4X)",
LookupOpcodeName(opcode), opcode);
return -1;
}
if (closing_) if (closing_)
return -1; return -1;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8849" #define REVISION_NR "8850"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__