Skip to content

fix(netpacket): Protect text length value from overflowing in NetPacketChatCommand, NetPacketDisconnectChatCommand #2284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xezon merged 2 commits into from
Feb 11, 2026
Merged

fix(netpacket): Protect text length value from overflowing in NetPacketChatCommand, NetPacketDisconnectChatCommand #2284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34eee70
fix(netpacket): Protect text length value from overflowing in NetPack…
xezon Feb 8, 2026
24d4e3e
Replace static method with enum constant
xezon Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Core/GameEngine/Include/GameNetwork/NetPacketStructs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,9 @@ struct NetPacketChatCommand {
NetPacketDataField dataHeader;
UnsignedByte textLength;
// Variable fields: WideChar text[textLength] + Int playerMask

enum { MaxTextLen = 255 };
static Int getUsableTextLength(const UnicodeString& text) { return min(text.getLength(), (Int)MaxTextLen); }
};

struct NetPacketDisconnectChatCommand {
Expand All @@ -203,6 +206,9 @@ struct NetPacketDisconnectChatCommand {
NetPacketDataField dataHeader;
UnsignedByte textLength;
// Variable fields: WideChar text[textLength]

enum { MaxTextLen = 255 };
static Int getUsableTextLength(const UnicodeString& text) { return min(text.getLength(), (Int)MaxTextLen); }
};

struct NetPacketGameCommand {
Expand Down
24 changes: 12 additions & 12 deletions Core/GameEngine/Source/GameNetwork/NetPacket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ void NetPacket::FillBufferWithDisconnectChatCommand(UnsignedByte *buffer, NetCom
packet->dataHeader.header = NetPacketFieldTypes::Data;

UnicodeString unitext = cmdMsg->getText();
Comment thread
xezon marked this conversation as resolved.
packet->textLength = unitext.getLength();
packet->textLength = NetPacketDisconnectChatCommand::getUsableTextLength(unitext);

// Variable data portion
UnsignedShort offset = sizeof(NetPacketDisconnectChatCommand);
Expand Down Expand Up @@ -758,7 +758,7 @@ void NetPacket::FillBufferWithChatCommand(UnsignedByte *buffer, NetCommandRef *m
packet->dataHeader.header = NetPacketFieldTypes::Data;

UnicodeString unitext = cmdMsg->getText();
packet->textLength = unitext.getLength();
packet->textLength = NetPacketChatCommand::getUsableTextLength(unitext);

// Variable data portion
UnsignedShort offset = sizeof(NetPacketChatCommand);
Expand Down Expand Up @@ -2299,12 +2299,12 @@ Bool NetPacket::addDisconnectChatCommand(NetCommandRef *msg) {
m_packet[m_packetLen] = NetPacketFieldTypes::Data;
++m_packetLen;
UnicodeString unitext = cmdMsg->getText();
UnsignedByte length = unitext.getLength();
memcpy(m_packet + m_packetLen, &length, sizeof(UnsignedByte));
UnsignedByte textLen = NetPacketDisconnectChatCommand::getUsableTextLength(unitext);
memcpy(m_packet + m_packetLen, &textLen, sizeof(UnsignedByte));
m_packetLen += sizeof(UnsignedByte);

memcpy(m_packet + m_packetLen, unitext.str(), length * sizeof(UnsignedShort));
m_packetLen += length * sizeof(UnsignedShort);
memcpy(m_packet + m_packetLen, unitext.str(), textLen * sizeof(UnsignedShort));
m_packetLen += textLen * sizeof(UnsignedShort);

// DEBUG_LOG_LEVEL(DEBUG_LEVEL_NET, ("NetPacket - added disconnect chat command"));

Expand Down Expand Up @@ -2335,7 +2335,7 @@ Bool NetPacket::isRoomForDisconnectChatMessage(NetCommandRef *msg) {

++len; // for NetPacketFieldTypes::Data
len += sizeof(UnsignedByte); // string length
UnsignedByte textLen = cmdMsg->getText().getLength();
UnsignedByte textLen = NetPacketDisconnectChatCommand::getUsableTextLength(cmdMsg->getText());
len += textLen * sizeof(UnsignedShort);
if ((len + m_packetLen) > MAX_PACKET_SIZE) {
return FALSE;
Expand Down Expand Up @@ -2410,13 +2410,13 @@ Bool NetPacket::addChatCommand(NetCommandRef *msg) {
m_packet[m_packetLen] = NetPacketFieldTypes::Data;
++m_packetLen;
UnicodeString unitext = cmdMsg->getText();
UnsignedByte length = unitext.getLength();
UnsignedByte textLen = NetPacketChatCommand::getUsableTextLength(unitext);
Int playerMask = cmdMsg->getPlayerMask();
memcpy(m_packet + m_packetLen, &length, sizeof(UnsignedByte));
memcpy(m_packet + m_packetLen, &textLen, sizeof(UnsignedByte));
m_packetLen += sizeof(UnsignedByte);

memcpy(m_packet + m_packetLen, unitext.str(), length * sizeof(UnsignedShort));
m_packetLen += length * sizeof(UnsignedShort);
memcpy(m_packet + m_packetLen, unitext.str(), textLen * sizeof(UnsignedShort));
m_packetLen += textLen * sizeof(UnsignedShort);

memcpy(m_packet + m_packetLen, &playerMask, sizeof(Int));
m_packetLen += sizeof(Int);
Expand Down Expand Up @@ -2458,7 +2458,7 @@ Bool NetPacket::isRoomForChatMessage(NetCommandRef *msg) {

++len; // for NetPacketFieldTypes::Data
len += sizeof(UnsignedByte); // string length
UnsignedByte textLen = cmdMsg->getText().getLength();
UnsignedByte textLen = NetPacketChatCommand::getUsableTextLength(cmdMsg->getText());
len += textLen * sizeof(UnsignedShort);
len += sizeof(Int); // playerMask
if ((len + m_packetLen) > MAX_PACKET_SIZE) {
Expand Down
Loading