Skip to content

Add empty signal payload validation #281

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

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add empty signal payload validation #281

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NetworkMesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,6 +484,13 @@ class CSignalingClient : public ISignalingClient
std::vector<uint8_t> signalData = pendingSignals.front();
pendingSignals.pop();

// Validate payload is not empty to prevent crashes in OpenSSL CMP validation
if (signalData.empty())
{
NetworkLog(ELogVerbosity::LOG_RELEASE, "[SIGNAL] Warning: Skipping empty signal data");
continue;
}

// Setup a context object that can respond if this signal is a connection request.
struct Context : ISteamNetworkingSignalingRecvContext
{
Expand Down
12 changes: 10 additions & 2 deletions ...alsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/OnlineServices_RoomsInterface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,15 @@ void WebSocket::Tick()
{
NetworkLog(ELogVerbosity::LOG_RELEASE, "[SIGNAL] Signal User: %lld!", signalData.target_user_id);
NetworkLog(ELogVerbosity::LOG_RELEASE, "[SIGNAL] Signal Payload Size: %d!", (int)signalData.payload.size());
m_pendingSignals.push(signalData.payload);
// Validate payload is not empty to prevent crashes in OpenSSL CMP validation
if (signalData.payload.size() > 0)
{
m_pendingSignals.push(signalData.payload);
}
else
{
NetworkLog(ELogVerbosity::LOG_RELEASE, "[SIGNAL] Warning: Ignoring empty signal payload from user %lld", signalData.target_user_id);
}
}
}
break;
Expand Down Expand Up @@ -1361,4 +1369,4 @@ void NGMP_OnlineServices_RoomsInterface::OnRosterUpdated(std::vector<std::string
{
m_RosterNeedsRefreshCallback();
}
}
}
Expand Down
Loading