aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Liptak <squeek502@hotmail.com>2023-06-07 22:50:45 -0700
committerRyan Liptak <squeek502@hotmail.com>2023-06-08 02:16:15 -0700
commitaf835111fa1397578392a4774454ac0d71eca77d (patch)
treeb089216012a03836c96facdb94c26a52815ed2e0
parent7555085e6304419c25bb870567eb265bb22d0337 (diff)
downloadzig-af835111fa1397578392a4774454ac0d71eca77d.tar.gz
zig-af835111fa1397578392a4774454ac0d71eca77d.zip
Allow recovering from Walker.next errors without continually hitting the same error
Before this commit, if Walker.next errored with e.g. `error.AccessDenied` and the caller did something like `while (true) { walker.next() catch continue; }`, then the directory that errored with AccessDenied would be continually iterated in each `next` call and error every time with AccessDenied. After this commit, the directory that errored will be popped off the stack before the error is returned, meaning that in the subsequent `next` call, it won't be retried and the Walker will continue with whatever directories remain on its stack. For a real example, before this commit, walking `/proc/` on my system would infinitely loop due to repeated AccessDenied errors on the same directory. After this commit, I am able to walk `/proc/` on my system fully (skipping over any directories that are unable to be iterated).
-rw-r--r--lib/std/fs.zig12
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/std/fs.zig b/lib/std/fs.zig
index 8ce8b74650..38b94873e6 100644
--- a/lib/std/fs.zig
+++ b/lib/std/fs.zig
@@ -958,7 +958,17 @@ pub const IterableDir = struct {
var top = &self.stack.items[self.stack.items.len - 1];
var containing = top;
var dirname_len = top.dirname_len;
- if (try top.iter.next()) |base| {
+ if (top.iter.next() catch |err| {
+ // If we get an error, then we want the user to be able to continue
+ // walking if they want, which means that we need to pop the directory
+ // that errored from the stack. Otherwise, all future `next` calls would
+ // likely just fail with the same error.
+ var item = self.stack.pop();
+ if (self.stack.items.len != 0) {
+ item.iter.dir.close();
+ }
+ return err;
+ }) |base| {
self.name_buffer.shrinkRetainingCapacity(dirname_len);
if (self.name_buffer.items.len != 0) {
try self.name_buffer.append(path.sep);