summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2022-10-21 06:05:39 +0200
committerLioncash <mathew1800@gmail.com>2022-10-21 06:09:22 +0200
commit0b181eeef4f56a814ea6c9b86d789be3ab8d1ae5 (patch)
tree1b64af71db6e0d5a834aba820a7507c90249efb5 /src
parentMerge pull request #9088 from Fdawgs/chore/images (diff)
downloadyuzu-0b181eeef4f56a814ea6c9b86d789be3ab8d1ae5.tar
yuzu-0b181eeef4f56a814ea6c9b86d789be3ab8d1ae5.tar.gz
yuzu-0b181eeef4f56a814ea6c9b86d789be3ab8d1ae5.tar.bz2
yuzu-0b181eeef4f56a814ea6c9b86d789be3ab8d1ae5.tar.lz
yuzu-0b181eeef4f56a814ea6c9b86d789be3ab8d1ae5.tar.xz
yuzu-0b181eeef4f56a814ea6c9b86d789be3ab8d1ae5.tar.zst
yuzu-0b181eeef4f56a814ea6c9b86d789be3ab8d1ae5.zip
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/service/hid/controllers/npad.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.cpp b/src/core/hle/service/hid/controllers/npad.cpp
index 98e4f2af7..ba8a1f786 100644
--- a/src/core/hle/service/hid/controllers/npad.cpp
+++ b/src/core/hle/service/hid/controllers/npad.cpp
@@ -745,8 +745,9 @@ void Controller_NPad::SetSupportedNpadIdTypes(u8* data, std::size_t length) {
}
void Controller_NPad::GetSupportedNpadIdTypes(u32* data, std::size_t max_length) {
- ASSERT(max_length < supported_npad_id_types.size());
- std::memcpy(data, supported_npad_id_types.data(), supported_npad_id_types.size());
+ const auto copy_amount = supported_npad_id_types.size() * sizeof(u32);
+ ASSERT(max_length <= copy_amount);
+ std::memcpy(data, supported_npad_id_types.data(), copy_amount);
}
std::size_t Controller_NPad::GetSupportedNpadIdTypesSize() const {