Skip to content

Commit 8811b6d

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 1ecc275 commit 8811b6d

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
@@ -936,6 +936,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
936936
int mingw_lstat(const char *file_name, struct stat *buf)
937937
{
938938
WIN32_FILE_ATTRIBUTE_DATA fdata;
939+
WIN32_FIND_DATAW findbuf = { 0 };
939940
wchar_t wfilename[MAX_LONG_PATH];
940941
int wlen = xutftowcs_long_path(wfilename, file_name);
941942
if (wlen < 0)
@@ -950,6 +951,13 @@ int mingw_lstat(const char *file_name, struct stat *buf)
950951
}
951952

952953
if (GetFileAttributesExW(wfilename, GetFileExInfoStandard, &fdata)) {
954+
/* for reparse points, use FindFirstFile to get the reparse tag */
955+
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
956+
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
957+
if (handle == INVALID_HANDLE_VALUE)
958+
goto error;
959+
FindClose(handle);
960+
}
953961
buf->st_ino = 0;
954962
buf->st_gid = 0;
955963
buf->st_uid = 0;
@@ -962,20 +970,16 @@ int mingw_lstat(const char *file_name, struct stat *buf)
962970
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
963971
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
964972
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
965-
WIN32_FIND_DATAW findbuf;
966-
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
967-
if (handle != INVALID_HANDLE_VALUE) {
968973
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
969974
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
970975
buf->st_mode = S_IFLNK | S_IREAD;
971976
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
972977
buf->st_mode |= S_IWRITE;
973978
}
974-
FindClose(handle);
975-
}
976979
}
977980
return 0;
978981
}
982+
error:
979983
switch (GetLastError()) {
980984
case ERROR_ACCESS_DENIED:
981985
case ERROR_SHARING_VIOLATION:

0 commit comments

Comments
 (0)