Skip to content

[pull] master from ruby:master #1435

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Sep 22, 2026
+13 −0
Merged

[pull] master from ruby:master #1435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions dir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,6 +1102,8 @@ dir_each_entry(VALUE dir, VALUE (*each)(VALUE, VALUE, struct dir_entry_args *),
.dp = dp,
};
(*each)(arg, path, &each_args);
/* the block may have closed dir */
if (!dirp->dir) dir_closed();
}
return dir;
}
Expand Down
11 changes: 11 additions & 0 deletions test/ruby/test_dir.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,17 @@ def test_close
assert_raise(IOError) { d.read }
end

def test_each_with_close
d = Dir.open(@root)
assert_raise(IOError) { d.each { d.close } }

d = Dir.open(@root)
assert_raise(IOError) { d.each_child { d.close } }

d = Dir.open(@root)
assert_raise(IOError) { d.scan { |*| d.close } }
end

def test_glob
assert_equal((%w(.) + ("a".."z").to_a).map{|f| File.join(@root, f) },
Dir.glob(File.join(@root, "*"), File::FNM_DOTMATCH))
Expand Down