1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Bug #20995] Protect IO.popen block from exiting by exception

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2025-01-02 15:50:20 +09:00
parent 6cf11ad76e
commit 8034e9c3d0
No known key found for this signature in database
GPG Key ID: 3582D74E1FEE4465
Notes: git 2025-01-02 08:06:34 +00:00 
Merged: https://github.com/ruby/ruby/pull/12497
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
io.c
View File

@ -8038,7 +8038,7 @@ popen_finish(VALUE port, VALUE klass)
if (NIL_P(port)) { if (NIL_P(port)) {
/* child */ /* child */
if (rb_block_given_p()) { if (rb_block_given_p()) {
rb_yield(Qnil); rb_protect(rb_yield, Qnil, NULL);
rb_io_flush(rb_ractor_stdout()); rb_io_flush(rb_ractor_stdout());
rb_io_flush(rb_ractor_stderr()); rb_io_flush(rb_ractor_stderr());
_exit(0); _exit(0);

20
test/ruby/test_process.rb
View File

@ -922,15 +922,29 @@ class TestProcess < Test::Unit::TestCase
} }
end end
if Process.respond_to?(:fork)
def test_popen_fork def test_popen_fork
IO.popen("-") {|io| IO.popen("-") do |io|
if !io if !io
puts "fooo" puts "fooo"
else else
assert_equal("fooo\n", io.read) assert_equal("fooo\n", io.read)
end end
} end
rescue NotImplementedError end
def test_popen_fork_ensure
IO.popen("-") do |io|
if !io
STDERR.reopen(STDOUT)
raise "fooo"
else
assert_empty io.read
end
end
rescue RuntimeError
abort "[Bug #20995] should not reach here"
end
end end
def test_fd_inheritance def test_fd_inheritance