diff options
Diffstat (limited to 'src/common/Utilities/Util.cpp')
| -rw-r--r-- | src/common/Utilities/Util.cpp | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 4a4daa33b25..36099263c03 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -17,6 +17,7 @@ #include "Util.h" #include "Common.h" +#include "Containers.h" #include "IpAddress.h" #include "StringFormat.h" #include <utf8.h> @@ -250,18 +251,10 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) { try { - size_t len = utf8::distance(utf8str, utf8str+csize); - if (len > wsize) - { - if (wsize > 0) - wstr[0] = L'\0'; - wsize = 0; - return false; - } - - wsize = len; - utf8::utf8to16(utf8str, utf8str+csize, wstr); - wstr[len] = L'\0'; + Trinity::BufferWriteGuard<wchar_t> guard(wstr, wsize); + guard = utf8::utf8to16(utf8str, utf8str+csize, guard); + wsize -= guard.size(); // remaining unused space + wstr[wsize] = L'\0'; } catch (std::exception const&) { @@ -276,13 +269,10 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) bool Utf8toWStr(const std::string& utf8str, std::wstring& wstr) { + wstr.clear(); try { - if (size_t len = utf8::distance(utf8str.c_str(), utf8str.c_str()+utf8str.size())) - { - wstr.resize(len); - utf8::utf8to16(utf8str.c_str(), utf8str.c_str()+utf8str.size(), &wstr[0]); - } + utf8::utf8to16(utf8str.c_str(), utf8str.c_str()+utf8str.size(), std::back_inserter(wstr)); } catch (std::exception const&) { |