Skip to content

bugfix(network): Prevent buffer overflow in NetPacket::readFileMessage() and NetPacket::readFileAnnounceMessage() #1981

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 1 commit into from
Dec 13, 2025
Merged

bugfix(network): Prevent buffer overflow in NetPacket::readFileMessage() and NetPacket::readFileAnnounceMessage() #1981

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 6 additions & 16 deletions Core/GameEngine/Source/GameNetwork/NetPacket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5807,15 +5807,10 @@ NetCommandMsg * NetPacket::readWrapperMessage(UnsignedByte *data, Int &i) {
NetCommandMsg * NetPacket::readFileMessage(UnsignedByte *data, Int &i) {
NetFileCommandMsg *msg = newInstance(NetFileCommandMsg);
char filename[_MAX_PATH];
char *c = filename;

while (data[i] != 0) {
*c = data[i];
++c;
++i;
}
*c = 0;
++i;
// TheSuperHackers @security Mauller/Jbremer/SkyAero 11/12/2025 Prevent buffer overflow when copying filepath string
i += strlcpy(filename, reinterpret_cast<const char*>(data), ARRAY_SIZE(filename));
++i; //Increment for null terminator
msg->setPortableFilename(AsciiString(filename)); // it's transferred as a portable filename

UnsignedInt dataLength = 0;
Expand All @@ -5834,15 +5829,10 @@ NetCommandMsg * NetPacket::readFileMessage(UnsignedByte *data, Int &i) {
NetCommandMsg * NetPacket::readFileAnnounceMessage(UnsignedByte *data, Int &i) {
NetFileAnnounceCommandMsg *msg = newInstance(NetFileAnnounceCommandMsg);
char filename[_MAX_PATH];
char *c = filename;

while (data[i] != 0) {
*c = data[i];
++c;
++i;
}
*c = 0;
++i;
// TheSuperHackers @security Mauller/Jbremer/SkyAero 11/12/2025 Prevent buffer overflow when copying filepath string
i += strlcpy(filename, reinterpret_cast<const char*>(data), ARRAY_SIZE(filename));
++i; //Increment for null terminator
msg->setPortableFilename(AsciiString(filename)); // it's transferred as a portable filename

UnsignedShort fileID = 0;
Expand Down
Loading