Skip to content

Commit 4d4277e

Browse files
dschoGit for Windows Build Agent
authored andcommitted
mingw: ignore HOMEDRIVE/HOMEPATH if it points to Windows' system directory
Internally, Git expects the environment variable `HOME` to be set, and to point to the current user's home directory. This environment variable is not set by default on Windows, and therefore Git tries its best to construct one if it finds `HOME` unset. There are actually two different approaches Git tries: first, it looks at `HOMEDRIVE`/`HOMEPATH` because this is widely used in corporate environments with roaming profiles, and a user generally wants their global Git settings to be in a roaming profile. Only when `HOMEDRIVE`/`HOMEPATH` is either unset or does not point to a valid location, Git will fall back to using `USERPROFILE` instead. However, starting with Windows Vista, for secondary logons and services, the environment variables `HOMEDRIVE`/`HOMEPATH` point to Windows' system directory (usually `C:\Windows\system32`). That is undesirable, and that location is usually write-protected anyway. So let's verify that the `HOMEDRIVE`/`HOMEPATH` combo does not point to Windows' system directory before using it, falling back to `USERPROFILE` if it does. This fixes git-for-windows#2709 Initial-Path-by: Ivan Pozdeev <vano@mail.mipt.ru> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent bcad6c4 commit 4d4277e

1 file changed

Lines changed: 14 additions & 1 deletion

File tree

compat/mingw.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3114,6 +3114,18 @@ static size_t append_system_bin_dirs(char *path, size_t size)
31143114
#endif
31153115
#endif
31163116

3117+
static int is_system32_path(const char *path)
3118+
{
3119+
WCHAR system32[MAX_PATH], wpath[MAX_PATH];
3120+
3121+
if (xutftowcs_path(wpath, path) < 0 ||
3122+
!GetSystemDirectoryW(system32, ARRAY_SIZE(system32)) ||
3123+
_wcsicmp(system32, wpath))
3124+
return 0;
3125+
3126+
return 1;
3127+
}
3128+
31173129
static void setup_windows_environment(void)
31183130
{
31193131
char *tmp = getenv("TMPDIR");
@@ -3154,7 +3166,8 @@ static void setup_windows_environment(void)
31543166
strbuf_addstr(&buf, tmp);
31553167
if ((tmp = getenv("HOMEPATH"))) {
31563168
strbuf_addstr(&buf, tmp);
3157-
if (is_directory(buf.buf))
3169+
if (!is_system32_path(buf.buf) &&
3170+
is_directory(buf.buf))
31583171
setenv("HOME", buf.buf, 1);
31593172
else
31603173
tmp = NULL; /* use $USERPROFILE */

0 commit comments

Comments
 (0)