Skip to content

Commit 14cecc0

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 c285ea7 commit 14cecc0

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
@@ -792,6 +792,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
792792
int mingw_lstat(const char *file_name, struct stat *buf)
793793
{
794794
WIN32_FILE_ATTRIBUTE_DATA fdata;
795+
WIN32_FIND_DATAW findbuf = { 0 };
795796
wchar_t wfilename[MAX_LONG_PATH];
796797
int wlen = xutftowcs_long_path(wfilename, file_name);
797798
if (wlen < 0)
@@ -806,6 +807,13 @@ int mingw_lstat(const char *file_name, struct stat *buf)
806807
}
807808

808809
if (GetFileAttributesExW(wfilename, GetFileExInfoStandard, &fdata)) {
810+
/* for reparse points, use FindFirstFile to get the reparse tag */
811+
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
812+
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
813+
if (handle == INVALID_HANDLE_VALUE)
814+
goto error;
815+
FindClose(handle);
816+
}
809817
buf->st_ino = 0;
810818
buf->st_gid = 0;
811819
buf->st_uid = 0;
@@ -818,20 +826,16 @@ int mingw_lstat(const char *file_name, struct stat *buf)
818826
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
819827
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
820828
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
821-
WIN32_FIND_DATAW findbuf;
822-
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
823-
if (handle != INVALID_HANDLE_VALUE) {
824829
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
825830
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
826831
buf->st_mode = S_IFLNK | S_IREAD;
827832
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
828833
buf->st_mode |= S_IWRITE;
829834
}
830-
FindClose(handle);
831-
}
832835
}
833836
return 0;
834837
}
838+
error:
835839
switch (GetLastError()) {
836840
case ERROR_ACCESS_DENIED:
837841
case ERROR_SHARING_VIOLATION:

0 commit comments

Comments
 (0)