Merge pull request #1817 from DarkLordZach/npad-idx-fix

npad: Use NPadIdToIndex to prevent invalid array access
6 years ago · c5ab648554
parent 6f849887c9 299224790c
commit c5ab648554
1 changed files with 2 additions and 2 deletions
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@ -575,8 +575,8 @@ void Controller_NPad::AddNewControllerAt(NPadControllerType controller, u32 npad
        return;
    }

-    connected_controllers[npad_id] = {controller, true};
-    InitNewlyAddedControler(npad_id);
+    connected_controllers[NPadIdToIndex(npad_id)] = {controller, true};
+    InitNewlyAddedControler(NPadIdToIndex(npad_id));
 }

 void Controller_NPad::ConnectNPad(u32 npad_id) {