diff options
| author |  bunnei | 2018-11-28 17:46:17 -0500 |
|---|---|---|
| committer |  GitHub | 2018-11-28 17:46:17 -0500 |
| commit | c5ab648554520c1828125ea1862831391aee3830 (patch) | |
| tree | b3b6d7964fe8a7624e150b6275b9abe3a4efecb7 /src | |
| parent | Merge pull request #1792 from bunnei/dma-pusher (diff) | |
| parent | npad: Use NPadIdToIndex to prevent invalid array access (diff) | |
| download | yuzu-c5ab648554520c1828125ea1862831391aee3830.tar.gz yuzu-c5ab648554520c1828125ea1862831391aee3830.tar.xz yuzu-c5ab648554520c1828125ea1862831391aee3830.zip | |
Merge pull request #1817 from DarkLordZach/npad-idx-fix
npad: Use NPadIdToIndex to prevent invalid array access
Diffstat (limited to 'src')
| -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 | |||
| 575 | return; | 575 | return; |
| 576 | } | 576 | } |
| 577 | 577 | ||
| 578 | connected_controllers[npad_id] = {controller, true}; | 578 | connected_controllers[NPadIdToIndex(npad_id)] = {controller, true}; |
| 579 | InitNewlyAddedControler(npad_id); | 579 | InitNewlyAddedControler(NPadIdToIndex(npad_id)); |
| 580 | } | 580 | } |
| 581 | 581 | ||
| 582 | void Controller_NPad::ConnectNPad(u32 npad_id) { | 582 | void Controller_NPad::ConnectNPad(u32 npad_id) { |