summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2022-10-21 09:47:02 +0200
committerGitHub <noreply@github.com>2022-10-21 09:47:02 +0200
commitefaedcab312b4ead2757bd5f06d3e57688d61cd4 (patch)
tree995ae08f705b60810339db1041f090139cd15e99 /src/core/hle
parentMerge pull request #9108 from Morph1984/r32-b24g8 (diff)
parenthid/npad: Fix copy size in GetSupportedNpadIdTypes (diff)
downloadyuzu-efaedcab312b4ead2757bd5f06d3e57688d61cd4.tar
yuzu-efaedcab312b4ead2757bd5f06d3e57688d61cd4.tar.gz
yuzu-efaedcab312b4ead2757bd5f06d3e57688d61cd4.tar.bz2
yuzu-efaedcab312b4ead2757bd5f06d3e57688d61cd4.tar.lz
yuzu-efaedcab312b4ead2757bd5f06d3e57688d61cd4.tar.xz
yuzu-efaedcab312b4ead2757bd5f06d3e57688d61cd4.tar.zst
yuzu-efaedcab312b4ead2757bd5f06d3e57688d61cd4.zip
Diffstat (limited to 'src/core/hle')
-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 {