pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Verify OP_Ack size & fix crash in BasePacket::build_raw_header_dump due to uninitialised timestamp

Browse Source
This commit is contained in:
Derision 2013-04-27 15:45:24 +01:00
parent 61f7009378
commit 401e897019
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changelog.txt
View File

@ -1,6 +1,9 @@
EQEMu Changelog (Started on Sept 24, 2003 15:50) EQEMu Changelog (Started on Sept 24, 2003 15:50)
------------------------------------------------------- -------------------------------------------------------
== 04/27/2013 ==
Pixel Bounds: Verify OP_Ack size & fix crash in BasePacket::build_raw_header_dump due to uninitialised timestamp.
== 04/24/2013 == == 04/24/2013 ==
Bad_Captain: Fixed a couple of merc stat issues. Bad_Captain: Fixed a couple of merc stat issues.
Bad_Captain: Removed unneeded bot pet AI. Bad_Captain: Removed unneeded bot pet AI.

1
common/BasePacket.cpp
View File

@ -28,6 +28,7 @@ BasePacket::BasePacket(const unsigned char *buf, uint32 len)
this->size=0; this->size=0;
this->_wpos = 0; this->_wpos = 0;
this->_rpos = 0; this->_rpos = 0;
this->timestamp.tv_sec = 0;
if (len>0) { if (len>0) {
this->size=len; this->size=len;
pBuffer= new unsigned char[len]; pBuffer= new unsigned char[len];

5
common/EQStream.cpp
View File

@ -284,6 +284,11 @@ uint32 processed=0,subpacket_length=0;
} }
break; break;
case OP_Ack: { case OP_Ack: {
if(!p->pBuffer || (p->Size() < 4))
{
_log(NET__ERROR, _L "Received OP_Ack that was of malformed size" __L);
break;
}
#ifndef COLLECTOR #ifndef COLLECTOR
uint16 seq=ntohs(*(uint16 *)(p->pBuffer)); uint16 seq=ntohs(*(uint16 *)(p->pBuffer));
AckPackets(seq); AckPackets(seq);