Skip to content

Commit 9d6f549

Browse files
neerajsi-msftdscho
authored andcommitted
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 721b645 commit 9d6f549

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

compat/mingw.c

+4-1
Original file line numberDiff line numberDiff line change
@@ -1278,8 +1278,11 @@ char *mingw_mktemp(char *template)
12781278
int offset = 0;
12791279

12801280
/* we need to return the path, thus no long paths here! */
1281-
if (xutftowcs_path(wtemplate, template) < 0)
1281+
if (xutftowcsn(wtemplate, template, MAX_PATH, -1) < 0) {
1282+
if (errno == ERANGE)
1283+
errno = ENAMETOOLONG;
12821284
return NULL;
1285+
}
12831286

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

0 commit comments

Comments
 (0)