Deflake directory iterator for windows (#24469)

Signed-off-by: Raven Black <ravenblack@dropbox.com>
envoyproxy · Dec 9, 2022 · c99a89c · c99a89c
1 parent ceca213
commit c99a89c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/source/common/filesystem/win32/directory_iterator_impl.cc b/source/common/filesystem/win32/directory_iterator_impl.cc
@@ -43,14 +43,18 @@ DirectoryIteratorImpl& DirectoryIteratorImpl::operator++() {
 }
 
 DirectoryEntry DirectoryIteratorImpl::makeEntry(const WIN32_FIND_DATA& find_data) {
+  // `IO_REPARSE_FLAG_SYMLINK` must only be used in conjunction with
+  // `FILE_ATTRIBUTE_REPARSE_POINT`, per documentation for `dwReserved0` at
+  // https://learn.microsoft.com/en-us/windows/win32/api/minwinbase/ns-minwinbase-win32_find_dataa
   if ((find_data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
       !(find_data.dwReserved0 & IO_REPARSE_TAG_SYMLINK)) {
     // The file is reparse point and not a symlink, so it can't be
     // a regular file or a directory
     return {std::string(find_data.cFileName), FileType::Other, absl::nullopt};
   } else if (find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
     return {std::string(find_data.cFileName), FileType::Directory, absl::nullopt};
-  } else if (find_data.dwReserved0 & IO_REPARSE_TAG_SYMLINK) {
+  } else if ((find_data.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) &&
+             (find_data.dwReserved0 & IO_REPARSE_TAG_SYMLINK)) {
     return {std::string(find_data.cFileName), FileType::Regular, absl::nullopt};
   } else {
     ULARGE_INTEGER file_size;