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

lib/icu/Win32: paranoid-ify the buffer length checks 

Passing `length+1` to `MultiByteToWideChar()` means the function may
fill the whole buffer with output data, and could theoretically
overwrite the null terminator.  In practice, this will never happen,
but this way, it's slightly more correct.

Also, null-terminate after `MultiByteToWideChar()`, after we got the
real output length.  Again, this would never have been a problem, but
who knows...
This commit is contained in:
Max Kellermann 2020-05-30 13:27:46 +02:00
parent 169810e8f4
commit 99afe8e6d1
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,13 +35,13 @@ WideCharToMultiByte(unsigned code_page, std::wstring_view src)
throw MakeLastError("Failed to convert from Unicode");
auto buffer = std::make_unique<char[]>(length + 1);
buffer[length] = '\0';
length = WideCharToMultiByte(code_page, 0, src.data(), src.size(),
buffer.get(), length + 1,
buffer.get(), length,
nullptr, nullptr);
if (length <= 0)
throw MakeLastError("Failed to convert from Unicode");
buffer[length] = '\0';
return AllocatedString<char>::Donate(buffer.release());
}
@ -54,11 +54,11 @@ MultiByteToWideChar(unsigned code_page, std::string_view src)
throw MakeLastError("Failed to convert to Unicode");
auto buffer = std::make_unique<wchar_t[]>(length + 1);
buffer[length] = L'\0';
length = MultiByteToWideChar(code_page, 0, src.data(), src.size(),
buffer.get(), length + 1);
buffer.get(), length);
if (length <= 0)
throw MakeLastError("Failed to convert to Unicode");
buffer[length] = L'\0';
return AllocatedString<wchar_t>::Donate(buffer.release());
}