mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

hidbus: Adjusted out-of-bounds size handling.

Browse Source
This commit is contained in:
yellows8 2020-12-03 18:03:32 -05:00
parent 1291966976
commit 0f38ec8a3d
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nx/source/services/hidbus.c
View File

@ -546,21 +546,21 @@ Result hidbusGetJoyPollingReceivedData(HidbusBusHandle handle, HidbusJoyPollingR
if (polling_mode == HidbusJoyPollingMode_SixAxisSensorDisable) {
size = tmp_entries.joydisable[i].out_size;
if (size > sizeof(tmp_entries.joydisable[i].data)) return MAKERESULT(Module_Libnx, LibnxError_ShouldNotHappen);
if (size > sizeof(tmp_entries.joydisable[i].data)) size = sizeof(tmp_entries.joydisable[i].data);
memcpy(recv_data[i].data, tmp_entries.joydisable[i].data, size);
recv_data[i].out_size = size;
recv_data[i].sampling_number = tmp_entries.joydisable[i].sampling_number;
}
else if (polling_mode == HidbusJoyPollingMode_SixAxisSensorEnable) {
size = tmp_entries.joyenable[i].out_size;
if (size > sizeof(tmp_entries.joyenable[i].data)) return MAKERESULT(Module_Libnx, LibnxError_ShouldNotHappen);
if (size > sizeof(tmp_entries.joyenable[i].data)) size = sizeof(tmp_entries.joyenable[i].data);
memcpy(recv_data[i].data, tmp_entries.joyenable[i].data, size);
recv_data[i].out_size = size;
recv_data[i].sampling_number = tmp_entries.joyenable[i].sampling_number;
}
else if (hosversionAtLeast(6,0,0) && polling_mode == HidbusJoyPollingMode_ButtonOnly) {
size = tmp_entries.joybutton[i].out_size;
if (size > sizeof(tmp_entries.joybutton[i].data)) return MAKERESULT(Module_Libnx, LibnxError_ShouldNotHappen);
if (size > sizeof(tmp_entries.joybutton[i].data)) size = sizeof(tmp_entries.joybutton[i].data);
memcpy(recv_data[i].data, tmp_entries.joybutton[i].data, size);
recv_data[i].out_size = size;
recv_data[i].sampling_number = tmp_entries.joybutton[i].sampling_number;