Skip to content

Commit 04ac44d

Browse files
kbleesdscho
authored andcommitted
Win32: let mingw_lstat() error early upon problems with reparse points
When obtaining lstat information for reparse points, we need to call FindFirstFile() in addition to GetFileInformationEx() to obtain the type of the reparse point (symlink, mount point etc.). However, currently there is no error handling whatsoever if FindFirstFile() fails. Call FindFirstFile() before modifying the stat *buf output parameter and error out if the call fails. Note: The FindFirstFile() return value includes all the data that we get from GetFileAttributesEx(), so we could replace GetFileAttributesEx() with FindFirstFile(). We don't do that because GetFileAttributesEx() is about twice as fast for single files. I.e. we only pay the extra cost of calling FindFirstFile() in the rare case that we encounter a reparse point. Note: The indentation of the remaining reparse point code will be fixed in the next patch. Signed-off-by: Karsten Blees <[email protected]>
1 parent a32c452 commit 04ac44d

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

compat/mingw.c

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -868,6 +868,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
868868
int mingw_lstat(const char *file_name, struct stat *buf)
869869
{
870870
WIN32_FILE_ATTRIBUTE_DATA fdata;
871+
WIN32_FIND_DATAW findbuf = { 0 };
871872
wchar_t wfilename[MAX_LONG_PATH];
872873
int wlen = xutftowcs_long_path(wfilename, file_name);
873874
if (wlen < 0)
@@ -882,6 +883,13 @@ int mingw_lstat(const char *file_name, struct stat *buf)
882883
}
883884

884885
if (GetFileAttributesExW(wfilename, GetFileExInfoStandard, &fdata)) {
886+
/* for reparse points, use FindFirstFile to get the reparse tag */
887+
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
888+
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
889+
if (handle == INVALID_HANDLE_VALUE)
890+
goto error;
891+
FindClose(handle);
892+
}
885893
buf->st_ino = 0;
886894
buf->st_gid = 0;
887895
buf->st_uid = 0;
@@ -894,20 +902,16 @@ int mingw_lstat(const char *file_name, struct stat *buf)
894902
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
895903
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
896904
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
897-
WIN32_FIND_DATAW findbuf;
898-
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
899-
if (handle != INVALID_HANDLE_VALUE) {
900905
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
901906
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
902907
buf->st_mode = S_IFLNK | S_IREAD;
903908
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
904909
buf->st_mode |= S_IWRITE;
905910
}
906-
FindClose(handle);
907-
}
908911
}
909912
return 0;
910913
}
914+
error:
911915
switch (GetLastError()) {
912916
case ERROR_ACCESS_DENIED:
913917
case ERROR_SHARING_VIOLATION:

0 commit comments

Comments
 (0)