[llvm] 79f34ae - [llvm] Fix assertion when stat fails in remove_directories
Ben Langmuir via llvm-commits
llvm-commits at lists.llvm.org
Fri Aug 12 11:35:14 PDT 2022
Author: Ben Langmuir
Date: 2022-08-12T11:32:04-07:00
New Revision: 79f34ae7fe926c907c2e68b22fc15428f2e4be4e
URL: https://github.com/llvm/llvm-project/commit/79f34ae7fe926c907c2e68b22fc15428f2e4be4e
DIFF: https://github.com/llvm/llvm-project/commit/79f34ae7fe926c907c2e68b22fc15428f2e4be4e.diff
LOG: [llvm] Fix assertion when stat fails in remove_directories
We were dereferencing an empty Optional if IgnoreErrors was true and the
stat failed.
rdar://60887887
Differential Revision: https://reviews.llvm.org/D131791
Added:
Modified:
llvm/lib/Support/Unix/Path.inc
llvm/unittests/Support/Path.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc
index 2ae7c6dc47e07..3ecc5c971b79f 100644
--- a/llvm/lib/Support/Unix/Path.inc
+++ b/llvm/lib/Support/Unix/Path.inc
@@ -1273,19 +1273,20 @@ static std::error_code remove_directories_impl(const T &Entry,
while (Begin != End) {
auto &Item = *Begin;
ErrorOr<basic_file_status> st = Item.status();
- if (!st && !IgnoreErrors)
- return st.getError();
+ if (st) {
+ if (is_directory(*st)) {
+ EC = remove_directories_impl(Item, IgnoreErrors);
+ if (EC && !IgnoreErrors)
+ return EC;
+ }
- if (is_directory(*st)) {
- EC = remove_directories_impl(Item, IgnoreErrors);
+ EC = fs::remove(Item.path(), true);
if (EC && !IgnoreErrors)
return EC;
+ } else if (!IgnoreErrors) {
+ return st.getError();
}
- EC = fs::remove(Item.path(), true);
- if (EC && !IgnoreErrors)
- return EC;
-
Begin.increment(EC);
if (EC && !IgnoreErrors)
return EC;
diff --git a/llvm/unittests/Support/Path.cpp b/llvm/unittests/Support/Path.cpp
index 6f002276509a8..08460a9502e25 100644
--- a/llvm/unittests/Support/Path.cpp
+++ b/llvm/unittests/Support/Path.cpp
@@ -816,6 +816,28 @@ TEST_F(FileSystemTest, RealPathNoReadPerm) {
ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory) + "/noreadperm"));
}
+TEST_F(FileSystemTest, RemoveDirectoriesNoExePerm) {
+ SmallString<64> Expanded;
+
+ ASSERT_NO_ERROR(
+ fs::create_directories(Twine(TestDirectory) + "/noexeperm/foo"));
+ ASSERT_TRUE(fs::exists(Twine(TestDirectory) + "/noexeperm/foo"));
+
+ fs::setPermissions(Twine(TestDirectory) + "/noexeperm",
+ fs::all_read | fs::all_write);
+
+ ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory) + "/noexeperm",
+ /*IgnoreErrors=*/true));
+ ASSERT_TRUE(fs::exists(Twine(TestDirectory) + "/noexeperm"));
+ ASSERT_EQ(fs::remove_directories(Twine(TestDirectory) + "/noexeperm",
+ /*IgnoreErrors=*/false),
+ errc::permission_denied);
+
+ fs::setPermissions(Twine(TestDirectory) + "/noexeperm", fs::all_perms);
+
+ ASSERT_NO_ERROR(fs::remove_directories(Twine(TestDirectory) + "/noexeperm",
+ /*IgnoreErrors=*/false));
+}
#endif
More information about the llvm-commits
mailing list