TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

device: Gracefully ignore invalid data index from raw input device

Browse Source
This commit is contained in:
rdb 2021-12-12 17:09:29 +01:00
parent 215ad6bfd9
commit 0e91f4ee1c
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panda/src/device/winRawInputDevice.cxx
View File

@ -663,7 +663,15 @@ process_report(PCHAR ptr, size_t size) {
if (status == HIDP_STATUS_SUCCESS) { if (status == HIDP_STATUS_SUCCESS) {
for (ULONG di = 0; di < count; ++di) { for (ULONG di = 0; di < count; ++di) {
if (data[di].DataIndex != _hat_data_index) { if (data[di].DataIndex != _hat_data_index) {
nassertd(data[di].DataIndex < _indices.size()) continue; if (data[di].DataIndex >= _indices.size()) {
if (device_cat.is_debug()) {
device_cat.debug()
<< "Ignoring out of range DataIndex " << data[di].DataIndex
<< "from raw device " << _path << "\n";
}
continue;
}
const Index &idx = _indices[data[di].DataIndex]; const Index &idx = _indices[data[di].DataIndex];
if (idx._axis >= 0) { if (idx._axis >= 0) {
if (idx._signed) { if (idx._signed) {