yuzu-emu
/
yuzu-android
Archived
1
0
Fork 0
Code

Merge pull request #9106 from lioncash/copy-err 

hid/npad: Fix copy size in GetSupportedNpadIdTypes
This commit is contained in:
liamwhite 2022-10-21 03:47:02 -04:00 committed by GitHub
parent 49682a0481 0b181eeef4
commit efaedcab31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/hle/service/hid/controllers/npad.cpp
View File

@ -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) { void Controller_NPad::GetSupportedNpadIdTypes(u32* data, std::size_t max_length) {
ASSERT(max_length < supported_npad_id_types.size()); const auto copy_amount = supported_npad_id_types.size() * sizeof(u32);
std::memcpy(data, supported_npad_id_types.data(), supported_npad_id_types.size()); ASSERT(max_length <= copy_amount);
std::memcpy(data, supported_npad_id_types.data(), copy_amount);
} }
std::size_t Controller_NPad::GetSupportedNpadIdTypesSize() const { std::size_t Controller_NPad::GetSupportedNpadIdTypesSize() const {