Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[hid_core] fix NPad crash on pikmin 4 due to nullref (#4249)

lizziea0f1cd1baf9b
diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cpp
index 044ad0fb32..a2fd23b534 100644
--- a/src/hid_core/resources/npad/npad.cpp
+++ b/src/hid_core/resources/npad/npad.cpp
@@ -504,9 +504,12 @@ void NPad::OnUpdate(Kernel::KernelCore& kernel, const Core::Timing::CoreTiming&
for (std::size_t i = 0; i < controller_data[aruid_index].size(); ++i) {
auto& controller = controller_data[aruid_index][i];
- controller.shared_memory =
- &data->shared_memory_format->npad.npad_entry[i].internal_state;
+ controller.shared_memory = &data->shared_memory_format->npad.npad_entry[i].internal_state;
auto* npad = controller.shared_memory;
+ if (!npad || !controller.device) {
+ LOG_WARNING(Service_HID, "No device for {}", i);
+ continue;
+ }
const auto& controller_type = controller.device->GetNpadStyleIndex();