ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12034 from MaverickAmon02/controller-update-race 

Fix unsafe netplay code in SI_DeviceGCController
This commit is contained in:
Admiral H. Curtiss 2023-07-09 14:13:44 +02:00 committed by GitHub
parent 7bb04ff1dc d122492db7
commit 80c44ea597
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/SI/SI.cpp
View File

@ -568,7 +568,7 @@ void SerialInterfaceManager::UpdateDevices()
NetPlay::SetSIPollBatching(false); NetPlay::SetSIPollBatching(false);
} }
SIDevices SerialInterfaceManager::GetDeviceType(int channel) SIDevices SerialInterfaceManager::GetDeviceType(int channel) const
{ {
if (channel < 0 || channel >= MAX_SI_CHANNELS || !m_channel[channel].device) if (channel < 0 || channel >= MAX_SI_CHANNELS || !m_channel[channel].device)
return SIDEVICE_NONE; return SIDEVICE_NONE;

2
Source/Core/Core/HW/SI/SI.h
View File

@ -63,7 +63,7 @@ public:
void ChangeDevice(SIDevices device, int channel); void ChangeDevice(SIDevices device, int channel);
SIDevices GetDeviceType(int channel); SIDevices GetDeviceType(int channel) const;
u32 GetPollXLines(); u32 GetPollXLines();

20
Source/Core/Core/HW/SI/SI_DeviceGCController.cpp
View File

@ -14,6 +14,7 @@
#include "Core/CoreTiming.h" #include "Core/CoreTiming.h"
#include "Core/HW/GCPad.h" #include "Core/HW/GCPad.h"
#include "Core/HW/ProcessorInterface.h" #include "Core/HW/ProcessorInterface.h"
#include "Core/HW/SI/SI.h"
#include "Core/HW/SI/SI_Device.h" #include "Core/HW/SI/SI_Device.h"
#include "Core/HW/SystemTimers.h" #include "Core/HW/SystemTimers.h"
#include "Core/Movie.h" #include "Core/Movie.h"
@ -36,14 +37,6 @@ CSIDevice_GCController::CSIDevice_GCController(Core::System& system, SIDevices d
m_origin.origin_stick_y = GCPadStatus::MAIN_STICK_CENTER_Y; m_origin.origin_stick_y = GCPadStatus::MAIN_STICK_CENTER_Y;
m_origin.substick_x = GCPadStatus::C_STICK_CENTER_X; m_origin.substick_x = GCPadStatus::C_STICK_CENTER_X;
m_origin.substick_y = GCPadStatus::C_STICK_CENTER_Y; m_origin.substick_y = GCPadStatus::C_STICK_CENTER_Y;
m_config_changed_callback_id = Config::AddConfigChangedCallback([this] { RefreshConfig(); });
RefreshConfig();
}
CSIDevice_GCController::~CSIDevice_GCController()
{
Config::RemoveConfigChangedCallback(m_config_changed_callback_id);
} }
int CSIDevice_GCController::RunBuffer(u8* buffer, int request_length) int CSIDevice_GCController::RunBuffer(u8* buffer, int request_length)
@ -316,7 +309,7 @@ void CSIDevice_GCController::SendCommand(u32 command, u8 poll)
if (pad_num < 4) if (pad_num < 4)
{ {
const SIDevices device = m_config_si_devices[pad_num]; const SIDevices device = m_system.GetSerialInterface().GetDeviceType(pad_num);
if (type == 1) if (type == 1)
CSIDevice_GCController::Rumble(pad_num, 1.0, device); CSIDevice_GCController::Rumble(pad_num, 1.0, device);
else else
@ -346,15 +339,6 @@ void CSIDevice_GCController::DoState(PointerWrap& p)
p.Do(m_last_button_combo); p.Do(m_last_button_combo);
} }
void CSIDevice_GCController::RefreshConfig()
{
for (int i = 0; i < 4; ++i)
{
const SerialInterface::SIDevices device = Config::Get(Config::GetInfoForSIDevice(i));
m_config_si_devices[i] = device;
}
}
CSIDevice_TaruKonga::CSIDevice_TaruKonga(Core::System& system, SIDevices device, int device_number) CSIDevice_TaruKonga::CSIDevice_TaruKonga(Core::System& system, SIDevices device, int device_number)
: CSIDevice_GCController(system, device, device_number) : CSIDevice_GCController(system, device, device_number)
{ {

7
Source/Core/Core/HW/SI/SI_DeviceGCController.h
View File

@ -54,7 +54,6 @@ protected:
public: public:
// Constructor // Constructor
CSIDevice_GCController(Core::System& system, SIDevices device, int device_number); CSIDevice_GCController(Core::System& system, SIDevices device, int device_number);
~CSIDevice_GCController() override;
// Run the SI Buffer // Run the SI Buffer
int RunBuffer(u8* buffer, int request_length) override; int RunBuffer(u8* buffer, int request_length) override;
@ -83,12 +82,6 @@ public:
protected: protected:
void SetOrigin(const GCPadStatus& pad_status); void SetOrigin(const GCPadStatus& pad_status);
private:
void RefreshConfig();
std::array<SIDevices, 4> m_config_si_devices{};
size_t m_config_changed_callback_id;
}; };
// "TaruKonga", the DK Bongo controller // "TaruKonga", the DK Bongo controller