tanner/logiops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix usbhid-dump SIGSEGV on #100

Browse Source
This commit is contained in:
pixl 2020-07-13 15:12:28 -04:00
parent dde2993223
commit 0f60c3896c
No known key found for this signature in database
GPG Key ID: 1866C148CD593B6E
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/logid/backend/hidpp/Report.cpp
View File

@ -161,9 +161,10 @@ Report::Report(Report::Type type, DeviceIndex device_index,
(sw_id & 0x0f); (sw_id & 0x0f);
} }
Report::Report(const std::vector<uint8_t>& data) Report::Report(const std::vector<uint8_t>& data) :
_data (data)
{ {
_data = data; _data.resize(HeaderLength + LongParamLength);
// Truncating data is entirely valid here. // Truncating data is entirely valid here.
switch(_data[Offset::Type]) { switch(_data[Offset::Type]) {

3
src/logid/backend/raw/RawDevice.cpp
View File

@ -262,6 +262,9 @@ std::vector<uint8_t> RawDevice::_respondToReport
throw TimeoutError(); throw TimeoutError();
_readReport(response, MAX_DATA_LENGTH, timeout); _readReport(response, MAX_DATA_LENGTH, timeout);
if(!_continue_respond)
throw TimeoutError();
// All reports have the device index at byte 2 // All reports have the device index at byte 2
if(response[1] != request[1]) { if(response[1] != request[1]) {
if(_continue_listen) if(_continue_listen)