pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-05 05:12:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Crash fix for trying to write a 0 length packet to another packet.

Browse Source
This commit is contained in:
KimLS 2017-04-18 20:14:30 -07:00
parent a834ec92a5
commit cfd7e9f4d3
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/net/packet.cpp
View File

@ -139,6 +139,10 @@ void EQ::Net::Packet::PutCString(size_t offset, const char *str)
void EQ::Net::Packet::PutPacket(size_t offset, const Packet &p) void EQ::Net::Packet::PutPacket(size_t offset, const Packet &p)
{ {
if (p.Length() == 0) {
return;
}
if (Length() < offset + p.Length()) { if (Length() < offset + p.Length()) {
if (!Resize(offset + p.Length())) { if (!Resize(offset + p.Length())) {
throw std::out_of_range("Packet::PutPacket(), could not resize packet and would of written past the end."); throw std::out_of_range("Packet::PutPacket(), could not resize packet and would of written past the end.");
@ -150,6 +154,10 @@ void EQ::Net::Packet::PutPacket(size_t offset, const Packet &p)
void EQ::Net::Packet::PutData(size_t offset, void *data, size_t length) void EQ::Net::Packet::PutData(size_t offset, void *data, size_t length)
{ {
if (length == 0) {
return;
}
if (Length() < offset + length) { if (Length() < offset + length) {
if (!Resize(offset + length)) { if (!Resize(offset + length)) {
throw std::out_of_range("Packet::PutData(), could not resize packet and would of written past the end."); throw std::out_of_range("Packet::PutData(), could not resize packet and would of written past the end.");