Skip to content

Commit d7a69c7

Browse files
neerajsi-msftGit for Windows Build Agent
authored and
Git for Windows Build Agent
committed
mingw: do not call xutftowcs_path in mingw_mktemp
The `xutftowcs_path` function canonicalizes absolute paths using GetFullPathNameW. This canonicalization may change the length of the string (e.g. getting rid of \.\), which breaks callers that pass the template string in a strbuf and expect the length of the string to remain the same. In my particular case, the tmp-objdir code is passing a strbuf to mkdtemp and is breaking since the strbuf.len is no longer synchronized with strlen(strbuf.buf). Signed-off-by: Neeraj K. Singh <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent deffa39 commit d7a69c7

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

compat/mingw.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1207,8 +1207,11 @@ char *mingw_mktemp(char *template)
12071207
int offset = 0;
12081208

12091209
/* we need to return the path, thus no long paths here! */
1210-
if (xutftowcs_path(wtemplate, template) < 0)
1210+
if (xutftowcsn(wtemplate, template, MAX_PATH, -1) < 0) {
1211+
if (errno == ERANGE)
1212+
errno = ENAMETOOLONG;
12111213
return NULL;
1214+
}
12121215

12131216
if (is_dir_sep(template[0]) && !is_dir_sep(template[1]) &&
12141217
iswalpha(wtemplate[0]) && wtemplate[1] == L':') {

0 commit comments

Comments
 (0)