diff options
| author | bunnei <bunneidev@gmail.com> | 2018-11-28 17:46:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 17:46:17 -0500 |
| commit | c5ab648554520c1828125ea1862831391aee3830 (patch) | |
| tree | b3b6d7964fe8a7624e150b6275b9abe3a4efecb7 | |
| parent | 6f849887c9e7fa51743809c3a4bcfd2e319dff8d (diff) | |
| parent | 299224790c7dfafb77e10248dee35b83c6e63cbb (diff) | |
Merge pull request #1817 from DarkLordZach/npad-idx-fix
npad: Use NPadIdToIndex to prevent invalid array access
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp index 46604887c..a089bf159 100644 --- 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) { |