Skip to content

VERY experimental Nintendo Switch 2 emulator

C++

[hid_core] fix bounds-check aruid index in GetControllerFromNpadIdType (#4064)

BoiledElectricity470d43df6da1
diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cpp
index 4710342848..04d8a85301 100644
--- a/src/hid_core/resources/npad/npad.cpp
+++ b/src/hid_core/resources/npad/npad.cpp
@@ -1144,7 +1144,11 @@ NPad::NpadControllerData& NPad::GetControllerFromNpadIdType(u64 aruid,
npad_id = Core::HID::NpadIdType::Player1;
}
const auto npad_index = NpadIdTypeToIndex(npad_id);
- const auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
+ auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
+ if (aruid_index >= AruidIndexMax) {
+ LOG_ERROR(Service_HID, "Invalid aruid:{:016X}", aruid);
+ aruid_index = 0;
+ }
return controller_data[aruid_index][npad_index];
}
@@ -1155,7 +1159,11 @@ const NPad::NpadControllerData& NPad::GetControllerFromNpadIdType(
npad_id = Core::HID::NpadIdType::Player1;
}
const auto npad_index = NpadIdTypeToIndex(npad_id);
- const auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
+ auto aruid_index = applet_resource_holder.applet_resource->GetIndexFromAruid(aruid);
+ if (aruid_index >= AruidIndexMax) {
+ LOG_ERROR(Service_HID, "Invalid aruid:{:016X}", aruid);
+ aruid_index = 0;
+ }
return controller_data[aruid_index][npad_index];
}