Skip to content

bugfix(network): Prevent out-of-bounds access and improve fallback for packet router slots #496

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
x64-dev merged 1 commit into from
May 7, 2026
Merged

bugfix(network): Prevent out-of-bounds access and improve fallback for packet router slots #496

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
20 changes: 14 additions & 6 deletions Core/GameEngine/Source/GameNetwork/ConnectionManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1344,7 +1344,7 @@ void ConnectionManager::updateRunAhead(Int oldRunAhead, Int frameRate, Bool didS
}
}

// 3) Convert jitter to a 0–1+ ratio relative to latency
// 3) Convert jitter to a 0–1+ ratio relative to latency
Real jitterRatio = 0.0f;
if (maxLatMs > 0)
{
Expand All @@ -1365,7 +1365,7 @@ void ConnectionManager::updateRunAhead(Int oldRunAhead, Int frameRate, Bool didS
}
else if (maxLatMs > 200)
{
// Medium-high latency (200–300 ms)
// Medium-high latency (200–300 ms)
minSlack = serviceConf.ibra_minslack_greaterthan200ms;
maxSlack = serviceConf.ibra_maxslack_greaterthan200ms;
}
Expand Down Expand Up @@ -1995,11 +1995,16 @@ PlayerLeaveCode ConnectionManager::disconnectPlayer(Int slot) {

if (slot == m_packetRouterSlot) {
Int index = 0;
while ((index < (MAX_SLOTS-1)) && (m_packetRouterFallback[index] != m_packetRouterSlot)) {
while ((index < MAX_SLOTS) && (m_packetRouterFallback[index] != m_packetRouterSlot)) {
++index;
}
++index;
m_packetRouterSlot = m_packetRouterFallback[index];
if (index < MAX_SLOTS) {
m_packetRouterSlot = m_packetRouterFallback[index];
} else {
DEBUG_LOG(("ConnectionManager::disconnectPlayer - packet router had no valid fallback, defaulting to local slot %d", m_localSlot));
m_packetRouterSlot = m_localSlot;
}
DEBUG_LOG(("Packet router left. New packet router is slot %d", m_packetRouterSlot));
retval = PLAYERLEAVECODE_PACKETROUTER;
}
Expand Down Expand Up @@ -2701,11 +2706,14 @@ void ConnectionManager::sendSingleFrameToPlayer(UnsignedInt playerID, UnsignedIn

UnsignedInt ConnectionManager::getNextPacketRouterSlot(UnsignedInt playerID) {
Int index = 0;
while ((index < (MAX_SLOTS-1)) && (m_packetRouterFallback[index] != playerID)) {
while ((index < MAX_SLOTS) && (m_packetRouterFallback[index] != playerID)) {
++index;
}
++index;
return m_packetRouterFallback[index];
if (index < MAX_SLOTS) {
return m_packetRouterFallback[index];
}
return MAX_SLOTS; // No valid next packet router; caller checks for >= MAX_SLOTS
}

void ConnectionManager::requestFrameDataResend(Int playerID, UnsignedInt frame) {
Expand Down
Loading