Skip to content

Commit 1078581

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 d883bcb commit 1078581

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
@@ -847,6 +847,7 @@ static int has_valid_directory_prefix(wchar_t *wfilename)
847847
int mingw_lstat(const char *file_name, struct stat *buf)
848848
{
849849
WIN32_FILE_ATTRIBUTE_DATA fdata;
850+
WIN32_FIND_DATAW findbuf = { 0 };
850851
wchar_t wfilename[MAX_LONG_PATH];
851852
int wlen = xutftowcs_long_path(wfilename, file_name);
852853
if (wlen < 0)
@@ -861,6 +862,13 @@ int mingw_lstat(const char *file_name, struct stat *buf)
861862
}
862863

863864
if (GetFileAttributesExW(wfilename, GetFileExInfoStandard, &fdata)) {
865+
/* for reparse points, use FindFirstFile to get the reparse tag */
866+
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
867+
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
868+
if (handle == INVALID_HANDLE_VALUE)
869+
goto error;
870+
FindClose(handle);
871+
}
864872
buf->st_ino = 0;
865873
buf->st_gid = 0;
866874
buf->st_uid = 0;
@@ -873,20 +881,16 @@ int mingw_lstat(const char *file_name, struct stat *buf)
873881
filetime_to_timespec(&(fdata.ftLastWriteTime), &(buf->st_mtim));
874882
filetime_to_timespec(&(fdata.ftCreationTime), &(buf->st_ctim));
875883
if (fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
876-
WIN32_FIND_DATAW findbuf;
877-
HANDLE handle = FindFirstFileW(wfilename, &findbuf);
878-
if (handle != INVALID_HANDLE_VALUE) {
879884
if ((findbuf.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
880885
(findbuf.dwReserved0 == IO_REPARSE_TAG_SYMLINK)) {
881886
buf->st_mode = S_IFLNK | S_IREAD;
882887
if (!(findbuf.dwFileAttributes & FILE_ATTRIBUTE_READONLY))
883888
buf->st_mode |= S_IWRITE;
884889
}
885-
FindClose(handle);
886-
}
887890
}
888891
return 0;
889892
}
893+
error:
890894
switch (GetLastError()) {
891895
case ERROR_ACCESS_DENIED:
892896
case ERROR_SHARING_VIOLATION:

0 commit comments

Comments
 (0)