preserve-emulation/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-07-11 01:24:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

NetPlayClient: Check for invalid pad indices

Browse Source 
Like 29e577d but for the client instead of the server.
This commit is contained in:
JosJuice
2026-05-30 17:14:18 +02:00
parent aabea5b1e3
commit 32eaf7961f
1 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Core/Core/NetPlayClient.cpp
+20 -16
View File
@@ -680,16 +680,17 @@ void NetPlayClient::OnPadData(sf::Packet& packet)
GCPadStatus pad;
packet >> pad.button;
if (!m_gba_config.at(map).enabled)
if (static_cast<size_t>(map) < m_gba_config.size() && !m_gba_config.at(map).enabled)
{
packet >> pad.analogA >> pad.analogB >> pad.stickX >> pad.stickY >> pad.substickX >>
pad.substickY >> pad.triggerLeft >> pad.triggerRight >> pad.isConnected;
}
// Trusting server for good map value (>=0 && <4)
// add to pad buffer
m_pad_buffer.at(map).Push(pad);
m_gc_pad_event.Set();
if (static_cast<size_t>(map) < m_pad_buffer.size())
{
m_pad_buffer.at(map).Push(pad);
m_gc_pad_event.Set();
}
}
}
@@ -702,20 +703,22 @@ void NetPlayClient::OnPadHostData(sf::Packet& packet)
GCPadStatus pad;
packet >> pad.button;
if (!m_gba_config.at(map).enabled)
if (static_cast<size_t>(map) < m_gba_config.size() && !m_gba_config.at(map).enabled)
{
packet >> pad.analogA >> pad.analogB >> pad.stickX >> pad.stickY >> pad.substickX >>
pad.substickY >> pad.triggerLeft >> pad.triggerRight >> pad.isConnected;
}
// Trusting server for good map value (>=0 && <4)
// write to last status
m_last_pad_status[map] = pad;
if (static_cast<size_t>(map) < m_last_pad_status.size())
m_last_pad_status[map] = pad;
if (!m_first_pad_status_received[map])
if (static_cast<size_t>(map) < m_first_pad_status_received.size())
{
m_first_pad_status_received[map] = true;
m_first_pad_status_received_event.Set();
if (!m_first_pad_status_received[map])
{
m_first_pad_status_received[map] = true;
m_first_pad_status_received_event.Set();
}
}
}
}
@@ -740,10 +743,11 @@ void NetPlayClient::OnWiimoteData(sf::Packet& packet)
pad.length = 0;
}
// Trusting server for good map value (>=0 && <4)
// add to pad buffer
m_wiimote_buffer.at(map).Push(pad);
m_wii_pad_event.Set();
if (static_cast<size_t>(map) < m_wiimote_buffer.size())
{
m_wiimote_buffer.at(map).Push(pad);
m_wii_pad_event.Set();
}
}
}