morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

[winpr] Put '\0' when converting empty string to wstr

Browse Source
This commit is contained in:
lazy5f
2025-04-20 18:06:15 +09:00
parent 6a4bbfc047
commit 706110ef4e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
winpr/libwinpr/crt/unicode_apple.m
View File

@@ -89,7 +89,8 @@ int int_MultiByteToWideChar(UINT CodePage, DWORD dwFlags, LPCSTR lpMultiByteStr,
const size_t mlen = MIN((size_t)utf16CharLen, cchWideChar);
const size_t len = _wcsnlen(utf16, mlen);
memcpy(lpWideCharStr, utf16, len * sizeof(WCHAR));
if ((len < (size_t)cchWideChar) && (len > 0) && (lpWideCharStr[len - 1] != '\0'))
if ((len < (size_t)cchWideChar) &&
((len == 0) || ((len > 0) && (lpWideCharStr[len - 1] != '\0'))))
lpWideCharStr[len] = '\0';
return utf16CharLen;
}