Skip to content

Commit 2e56150

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 40d0f2f commit 2e56150

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

compat/mingw.c

+9-5
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
838838
int mingw_lstat(const char *file_name, struct stat *buf)
839839
{
840840
WIN32_FILE_ATTRIBUTE_DATA fdata;
841+
WIN32_FIND_DATAW findbuf = { 0 };
841842
wchar_t wfilename[MAX_LONG_PATH];
842843
int wlen = xutftowcs_long_path(wfilename, file_name);
843844
if (wlen < 0)
@@ -852,6 +853,13 @@ int mingw_lstat(const char *file_name, struct stat *buf)
852853
}
853854

854855
if (GetFileAttributesExW(wfilename, GetFileExInfoStandard, &fdata)) {
856+
/* for reparse points, use FindFirstFile to get the reparse tag */
857+
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
858+
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
859+
if (handle == INVALID_HANDLE_VALUE)
860+
goto error;
861+
FindClose(handle);
862+
}
855863
buf->st_ino = 0;
856864
buf->st_gid = 0;
857865
buf->st_uid = 0;
@@ -864,20 +872,16 @@ int mingw_lstat(const char *file_name, struct stat *buf)
864872
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
865873
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
866874
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
867-
WIN32_FIND_DATAW findbuf;
868-
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
869-
if (handle != INVALID_HANDLE_VALUE) {
870875
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
871876
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
872877
buf->st_mode = S_IFLNK | S_IREAD;
873878
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
874879
buf->st_mode |= S_IWRITE;
875880
}
876-
FindClose(handle);
877-
}
878881
}
879882
return 0;
880883
}
884+
error:
881885
switch (GetLastError()) {
882886
case ERROR_ACCESS_DENIED:
883887
case ERROR_SHARING_VIOLATION:

0 commit comments

Comments
 (0)