archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 18:13:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 8034e9c3d0: [Backport #20995]

Browse source 
[Bug #20995] Protect `IO.popen` block from exiting by exception
This commit is contained in:
Takashi Kokubun 2025-02-13 18:01:20 -08:00
parent c989d90754
commit b65cea7429
3 changed files with 24 additions and 10 deletions
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

2
version.h
View file

@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 1 #define RUBY_VERSION_TEENY 1
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 10 #define RUBY_PATCHLEVEL 11
#include "ruby/version.h" #include "ruby/version.h"
#include "ruby/internal/abi.h" #include "ruby/internal/abi.h"