Skip to content

Commit 172c62c

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 655c3b9 commit 172c62c

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

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

0 commit comments

Comments
 (0)