Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5800 

6ca033d hid_error() could return a null, which causes the program to crash with (TheQuantumPhysicist)
This commit is contained in:
luigi1111 2019-08-21 15:36:05 -05:00
parent d035af8e92 6ca033d278
commit 28e0a28b96
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/device/device_io_hid.cpp
View File

@ -44,7 +44,8 @@ namespace hw {
static std::string safe_hid_error(hid_device *hwdev) { static std::string safe_hid_error(hid_device *hwdev) {
if (hwdev) { if (hwdev) {
return std::string((char*)hid_error(hwdev)); const char* error_str = (const char*)hid_error(hwdev);
return std::string(error_str == nullptr ? "Unknown error" : error_str);
} }
return std::string("NULL device"); return std::string("NULL device");
} }