diff options
| -rw-r--r-- | src/common/Utilities/Util.cpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/common/Utilities/Util.cpp b/src/common/Utilities/Util.cpp index 099de72c7af..f787edd13ea 100644 --- a/src/common/Utilities/Util.cpp +++ b/src/common/Utilities/Util.cpp @@ -258,9 +258,23 @@ bool Utf8toWStr(char const* utf8str, size_t csize, wchar_t* wstr, size_t& wsize) } catch (std::exception const&) { - if (wsize > 0) + // Replace the converted string with an error message if there is enough space + // Otherwise just return an empty string + wchar_t const* errorMessage = L"An error occurred converting string from UTF-8 to WStr"; + size_t errorMessageLength = wcslen(errorMessage); + if (wsize >= errorMessageLength) + { + wcscpy(wstr, errorMessage); + wsize = wcslen(wstr); + } + else if (wsize > 0) + { wstr[0] = L'\0'; - wsize = 0; + wsize = 0; + } + else + wsize = 0; + return false; } |