Skip to content

Commit 7b725b0

Browse files
dschoGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
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 <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 46c6ccf commit 7b725b0

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

compat/mingw.c

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2821,6 +2821,18 @@ static size_t append_system_bin_dirs(char *path, size_t size)
28212821
#endif
28222822
#endif
28232823

2824+
static int is_system32_path(const char *path)
2825+
{
2826+
WCHAR system32[MAX_PATH], wpath[MAX_PATH];
2827+
2828+
if (xutftowcs_path(wpath, path) < 0 ||
2829+
!GetSystemDirectoryW(system32, ARRAY_SIZE(system32)) ||
2830+
_wcsicmp(system32, wpath))
2831+
return 0;
2832+
2833+
return 1;
2834+
}
2835+
28242836
static void setup_windows_environment(void)
28252837
{
28262838
char *tmp = getenv("TMPDIR");
@@ -2861,7 +2873,8 @@ static void setup_windows_environment(void)
28612873
strbuf_addstr(&buf, tmp);
28622874
if ((tmp = getenv("HOMEPATH"))) {
28632875
strbuf_addstr(&buf, tmp);
2864-
if (is_directory(buf.buf))
2876+
if (!is_system32_path(buf.buf) &&
2877+
is_directory(buf.buf))
28652878
setenv("HOME", buf.buf, 1);
28662879
else
28672880
tmp = NULL; /* use $USERPROFILE */

0 commit comments

Comments
 (0)