yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

hid/npad: Fix copy size in GetSupportedNpadIdTypes 

Previously this was passing the size of the vector into memcpy rather
than the size in bytes to copy, which would result in a partial read.

Thankfully, this function isn't used yet, so this gets rid of a bug
before it's able to do anything.
This commit is contained in:
Lioncash 2022-10-21 00:05:39 -04:00
parent 6b71530fa8
commit 0b181eeef4
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 {