oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

lib/icu: add null terminate in win32 string and wstring

Browse Source
This commit is contained in:
Shen-Ta Hsieh 2020-05-30 04:01:23 +08:00
parent 9f5c6d29b2
commit 169810e8f4
No known key found for this signature in database
GPG Key ID: DF7FED2B0492FA77
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/icu/Win32.cxx
View File

@ -34,9 +34,10 @@ WideCharToMultiByte(unsigned code_page, std::wstring_view src)
if (length <= 0) if (length <= 0)
throw MakeLastError("Failed to convert from Unicode"); throw MakeLastError("Failed to convert from Unicode");
std::unique_ptr<char[]> buffer(new char[length]); auto buffer = std::make_unique<char[]>(length + 1);
buffer[length] = '\0';
length = WideCharToMultiByte(code_page, 0, src.data(), src.size(), length = WideCharToMultiByte(code_page, 0, src.data(), src.size(),
buffer.get(), length, buffer.get(), length + 1,
nullptr, nullptr); nullptr, nullptr);
if (length <= 0) if (length <= 0)
throw MakeLastError("Failed to convert from Unicode"); throw MakeLastError("Failed to convert from Unicode");
@ -52,9 +53,10 @@ MultiByteToWideChar(unsigned code_page, std::string_view src)
if (length <= 0) if (length <= 0)
throw MakeLastError("Failed to convert to Unicode"); throw MakeLastError("Failed to convert to Unicode");
std::unique_ptr<wchar_t[]> buffer(new wchar_t[length]); auto buffer = std::make_unique<wchar_t[]>(length + 1);
buffer[length] = L'\0';
length = MultiByteToWideChar(code_page, 0, src.data(), src.size(), length = MultiByteToWideChar(code_page, 0, src.data(), src.size(),
buffer.get(), length); buffer.get(), length + 1);
if (length <= 0) if (length <= 0)
throw MakeLastError("Failed to convert to Unicode"); throw MakeLastError("Failed to convert to Unicode");