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
commit 28e0a28b96
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -44,7 +44,8 @@ namespace hw {
static std::string safe_hid_error(hid_device *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");
}