luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win: fix encoding issue of uv_os_gethostname()

Browse Source 
Windows API gethostname(buffer, size) return unicode string in char
array. It will cause grabled code if the host name contains non ascii
characters without cast into multi byte char.

This change keep the same encoding with the implementation on
unix/macOs platform, which is "utf-8"

Fix issue #3148
This commit is contained in:
eagleliang 2021-04-16 17:11:09 +08:00
parent 47e0c5c575
commit 2a49a5971b
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/win/util.c
View File

@ -1676,14 +1676,27 @@ int uv_os_gethostname(char* buffer, size_t* size) {
return uv_translate_sys_error(WSAGetLastError());
buf[sizeof(buf) - 1] = '\0'; /* Null terminate, just to be safe. */
len = strlen(buf);
int utf16StrBufSize = MultiByteToWideChar(CP_ACP, 0, buf, -1, NULL, 0);
WCHAR* utf16Str = uv__malloc(sizeof(WCHAR) * utf16StrBufSize);
MultiByteToWideChar(CP_ACP, 0, buf, -1, utf16Str, utf16StrBufSize);
char* utf8Str = uv__malloc(sizeof(char) * UV_MAXHOSTNAMESIZE);
int res = uv__convert_utf16_to_utf8(utf16Str, utf16StrBufSize, &utf8Str);
uv__free(utf16Str);
if (res != 0) {
uv__free(utf8Str);
return res;
}
len = strlen(utf8Str);
if (len >= *size) {
*size = len + 1;
uv__free(utf8Str);
return UV_ENOBUFS;
}
memcpy(buffer, buf, len + 1);
memcpy(buffer, utf8Str, len + 1);
uv__free(utf8Str);
*size = len;
return 0;
}