aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxiphon <xiphon@protonmail.com>2020-02-29 22:46:19 +0000
committerxiphon <xiphon@protonmail.com>2020-03-01 11:42:48 +0000
commit6e1cb5a4d03a67543b605be8d3944ae9e221c333 (patch)
tree62682b516b11af45a6ab2cf109d8a1c0746cb177
parentMerge pull request #6048 (diff)
downloadmonero-6e1cb5a4d03a67543b605be8d3944ae9e221c333.tar.xz
device: Ledger - fix wide char hidapi error string conversion
-rw-r--r--src/device/device_io_hid.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/device/device_io_hid.cpp b/src/device/device_io_hid.cpp
index 72f4c3bdb..840529c38 100644
--- a/src/device/device_io_hid.cpp
+++ b/src/device/device_io_hid.cpp
@@ -44,8 +44,20 @@ namespace hw {
static std::string safe_hid_error(hid_device *hwdev) {
if (hwdev) {
- const char* error_str = (const char*)hid_error(hwdev);
- return std::string(error_str == nullptr ? "Unknown error" : error_str);
+ const wchar_t* error_wstr = hid_error(hwdev);
+ 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");
}