Skip to content

Commit cec2b95

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 f1f9949 commit cec2b95

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
@@ -708,6 +708,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
708708
int mingw_lstat(const char *file_name, struct stat *buf)
709709
{
710710
WIN32_FILE_ATTRIBUTE_DATA fdata;
711+
WIN32_FIND_DATAW findbuf = { 0 };
711712
wchar_t wfilename[MAX_LONG_PATH];
712713
int wlen = xutftowcs_long_path(wfilename, file_name);
713714
if (wlen < 0)
@@ -722,6 +723,13 @@ int mingw_lstat(const char *file_name, struct stat *buf)
722723
}
723724

724725
if (GetFileAttributesExW(wfilename, GetFileExInfoStandard, &fdata)) {
726+
/* for reparse points, use FindFirstFile to get the reparse tag */
727+
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
728+
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
729+
if (handle == INVALID_HANDLE_VALUE)
730+
goto error;
731+
FindClose(handle);
732+
}
725733
buf->st_ino = 0;
726734
buf->st_gid = 0;
727735
buf->st_uid = 0;
@@ -734,20 +742,16 @@ int mingw_lstat(const char *file_name, struct stat *buf)
734742
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
735743
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
736744
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
737-
WIN32_FIND_DATAW findbuf;
738-
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
739-
if (handle != INVALID_HANDLE_VALUE) {
740745
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
741746
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
742747
buf->st_mode = S_IFLNK | S_IREAD;
743748
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
744749
buf->st_mode |= S_IWRITE;
745750
}
746-
FindClose(handle);
747-
}
748751
}
749752
return 0;
750753
}
754+
error:
751755
switch (GetLastError()) {
752756
case ERROR_ACCESS_DENIED:
753757
case ERROR_SHARING_VIOLATION:

0 commit comments

Comments
 (0)