c/libuv
1
0
Fork 0
mirror of https://github.com/libuv/libuv synced 2025-03-28 21:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

win: fix env var in uv_os_homedir and uv_os_tmpdir (#4464)

Browse Source 
If the corresponding environment variables are empty, the
uv_us_homedir() and uv_os_tmpdir() return garbage values. The reason
for this situation is the Windows API which doesn't return an error
even if the path is empty.

This PR fixes this problem by checking the return value of the API
call. If it is not an error and the length of the value is less than 3,
uv_us_homedir() and uv_os_tmpdir() will return UV_ENOENT.

Fixes: https://github.com/libuv/libuv/issues/2328
This commit is contained in:
Hüseyin Açacak 2024-07-30 00:50:11 +03:00 committed by GitHub
parent 18266a6969
commit 83306585ff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/win/util.c
View File

@ -942,8 +942,13 @@ int uv_os_homedir(char* buffer, size_t* size) {
r = uv_os_getenv("USERPROFILE", buffer, size);
/* Don't return an error if USERPROFILE was not found. */
if (r != UV_ENOENT)
if (r != UV_ENOENT) {
/* USERPROFILE is empty or invalid */
if (r == 0 && *size < 3) {
return UV_ENOENT;
}
return r;
}
/* USERPROFILE is not set, so call uv_os_get_passwd() */
r = uv_os_get_passwd(&pwd);
@ -980,6 +985,12 @@ int uv_os_tmpdir(char* buffer, size_t* size) {
if (len == 0) {
return uv_translate_sys_error(GetLastError());
}
/* tmp path is empty or invalid */
if (len < 3) {
return UV_ENOENT;
}
/* Include space for terminating null char. */
len += 1;
path = uv__malloc(len * sizeof(wchar_t));

9
test/test-homedir.c
View File

@ -68,5 +68,14 @@ TEST_IMPL(homedir) {
r = uv_os_homedir(homedir, &len);
ASSERT_EQ(r, UV_EINVAL);
#ifdef _WIN32
/* Test empty environment variable */
r = uv_os_setenv("USERPROFILE", "");
ASSERT_EQ(r, 0);
len = sizeof homedir;
r = uv_os_homedir(homedir, &len);
ASSERT_EQ(r, UV_ENOENT);
#endif
return 0;
}

7
test/test-tmpdir.c
View File

@ -76,6 +76,13 @@ TEST_IMPL(tmpdir) {
size_t lenx = sizeof tmpdirx;
r = uv_os_tmpdir(tmpdirx, &lenx);
ASSERT_OK(r);
/* Test empty environment variable */
r = uv_os_setenv("TMP", "");
ASSERT_EQ(r, 0);
len = sizeof tmpdir;
r = uv_os_tmpdir(tmpdir, &len);
ASSERT_EQ(r, UV_ENOENT);
#endif
return 0;