mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-27 12:45:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

even with 0902ca53d25a0365f673f599378f8c88b083ed3d

Browse source
This commit is contained in:
R2DLiu 2020-08-22 09:33:35 -04:00
commit 3b0b8372c7
1 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/Core/Core/Slippi/SlippiNetplay.cpp
View file

@ -125,15 +125,21 @@ SlippiNetplayClient::SlippiNetplayClient(bool isDecider)
// called from ---NETPLAY--- thread // called from ---NETPLAY--- thread
unsigned int SlippiNetplayClient::OnData(sf::Packet& packet) unsigned int SlippiNetplayClient::OnData(sf::Packet& packet)
{ {
NetPlay::MessageId mid; NetPlay::MessageId mid = 0;
packet >> mid; if (!(packet >> mid)) {
ERROR_LOG(SLIPPI_ONLINE, "Received empty netplay packet");
return 0;
}
switch (mid) switch (mid)
{ {
case NetPlay::NP_MSG_SLIPPI_PAD: case NetPlay::NP_MSG_SLIPPI_PAD:
{ {
int32_t frame; int32_t frame;
packet >> frame; if (!(packet >> frame)) {
ERROR_LOG(SLIPPI_ONLINE, "Netplay packet too small to read frame count");
break;
}
// Pad received, try to guess what our local time was when the frame was sent by our opponent // Pad received, try to guess what our local time was when the frame was sent by our opponent
// before we initialized // before we initialized
@ -175,6 +181,13 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet)
int32_t headFrame = remotePadQueue.empty() ? 0 : remotePadQueue.front()->frame; int32_t headFrame = remotePadQueue.empty() ? 0 : remotePadQueue.front()->frame;
int inputsToCopy = frame - headFrame; int inputsToCopy = frame - headFrame;
// Check that the packet actually contains the data it claims to
if ((5 + inputsToCopy * SLIPPI_PAD_DATA_SIZE) > (int)packet.getDataSize()) {
ERROR_LOG(SLIPPI_ONLINE, "Netplay packet too small to read pad buffer");
break;
}
for (int i = inputsToCopy - 1; i >= 0; i--) for (int i = inputsToCopy - 1; i >= 0; i--)
{ {
auto pad = std::make_unique<SlippiPad>(frame - i, &packetData[5 + i * SLIPPI_PAD_DATA_SIZE]); auto pad = std::make_unique<SlippiPad>(frame - i, &packetData[5 + i * SLIPPI_PAD_DATA_SIZE]);
@ -201,7 +214,10 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet)
// Store last frame acked // Store last frame acked
int32_t frame; int32_t frame;
packet >> frame; if (!(packet >> frame)) {
ERROR_LOG(SLIPPI_ONLINE, "Ack packet too small to read frame");
break;
}
lastFrameAcked = frame > lastFrameAcked ? frame : lastFrameAcked; lastFrameAcked = frame > lastFrameAcked ? frame : lastFrameAcked;
@ -257,7 +273,7 @@ unsigned int SlippiNetplayClient::OnData(sf::Packet& packet)
break; break;
default: default:
PanicAlertT("Unknown message received with id : %d", mid); WARN_LOG(SLIPPI_ONLINE, "Unknown message received with id : %d", mid);
break; break;
} }