nihilist/monero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6364

Browse Source 
6e1cb5a device: Ledger - fix wide char hidapi error string conversion (xiphon)
This commit is contained in:
luigi1111 2020-04-04 13:02:18 -05:00
commit 59ab769210
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/device/device_io_hid.cpp
View File

@ -44,8 +44,20 @@ namespace hw {
static std::string safe_hid_error(hid_device *hwdev) { static std::string safe_hid_error(hid_device *hwdev) {
if (hwdev) { if (hwdev) {
const char* error_str = (const char*)hid_error(hwdev); const wchar_t* error_wstr = hid_error(hwdev);
return std::string(error_str == nullptr ? "Unknown error" : error_str); if (error_wstr == nullptr)
{
return "Unknown error";
}
std::mbstate_t state{};
const size_t len_symbols = std::wcsrtombs(nullptr, &error_wstr, 0, &state);
if (len_symbols == static_cast<std::size_t>(-1))
{
return "Failed to convert wide char error";
}
std::string error_str(len_symbols + 1, 0);
std::wcsrtombs(&error_str[0], &error_wstr, error_str.size(), &state);
return error_str;
} }
return std::string("NULL device"); return std::string("NULL device");
} }