Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-09-26 12:16:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

NetPlay: Validate controller packet indices

Browse Source
This commit is contained in:
agalq13
2026-06-11 12:35:30 +03:00
parent 1bc93fd16d
commit 29e577d966
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/Core/NetPlayServer.cpp
View File

@@ -192,6 +192,12 @@ static void ClearPeerPlayerId(ENetPeer* peer)
} }
} }
template <typename T>
static bool IsValidPadIndex(const T& map_array, PadIndex index)
{
return index >= 0 && static_cast<size_t>(index) < map_array.size();
}
void NetPlayServer::SetupIndex() void NetPlayServer::SetupIndex()
{ {
if (!Config::Get(Config::NETPLAY_USE_INDEX) || Config::Get(Config::NETPLAY_INDEX_NAME).empty() || if (!Config::Get(Config::NETPLAY_USE_INDEX) || Config::Get(Config::NETPLAY_INDEX_NAME).empty() ||
@@ -814,7 +820,7 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player)
// If the data is not from the correct player, // If the data is not from the correct player,
// then disconnect them. // then disconnect them.
if (m_pad_map.at(map) != player.pid) if (!IsValidPadIndex(m_pad_map, map) || m_pad_map.at(map) != player.pid)
{ {
return 1; return 1;
} }
@@ -862,6 +868,9 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player)
PadIndex map; PadIndex map;
packet >> map; packet >> map;
if (!IsValidPadIndex(m_pad_map, map))
return 1;
GCPadStatus pad; GCPadStatus pad;
packet >> pad.button; packet >> pad.button;
spac << map << pad.button; spac << map << pad.button;
@@ -895,7 +904,7 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player)
// If the data is not from the correct player, // If the data is not from the correct player,
// then disconnect them. // then disconnect them.
if (m_wiimote_map.at(map) != player.pid) if (!IsValidPadIndex(m_wiimote_map, map) || m_wiimote_map.at(map) != player.pid)
{ {
return 1; return 1;
} }