diff options
| -rw-r--r-- | process.c | 11 | ||||
| -rw-r--r-- | test/ruby/test_process.rb | 9 |
2 files changed, 18 insertions, 2 deletions
@@ -2905,13 +2905,20 @@ rb_f_exec(int argc, const VALUE *argv) struct rb_execarg *eargp; #define CHILD_ERRMSG_BUFLEN 80 char errmsg[CHILD_ERRMSG_BUFLEN] = { '\0' }; - int err; + int err, state; execarg_obj = rb_execarg_new(argc, argv, TRUE, FALSE); eargp = rb_execarg_get(execarg_obj); if (mjit_enabled) mjit_finish(false); // avoid leaking resources, and do not leave files. XXX: JIT-ed handle can leak after exec error is rescued. before_exec(); /* stop timer thread before redirects */ - rb_execarg_parent_start(execarg_obj); + + rb_protect(rb_execarg_parent_start1, execarg_obj, &state); + if (state) { + execarg_parent_end(execarg_obj); + after_exec(); /* restart timer thread */ + rb_jump_tag(state); + } + fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name; err = exec_async_signal_safe(eargp, errmsg, sizeof(errmsg)); diff --git a/test/ruby/test_process.rb b/test/ruby/test_process.rb index 115c33a078..53599a6318 100644 --- a/test/ruby/test_process.rb +++ b/test/ruby/test_process.rb @@ -2397,6 +2397,15 @@ EOS r.close if r end if defined?(fork) + def test_rescue_exec_fail + assert_separately([], "#{<<~"begin;"}\n#{<<~'end;'}") + begin; + assert_raise(Errno::ENOENT) do + exec("", in: "") + end + end; + end + def test_many_args bug11418 = '[ruby-core:70251] [Bug #11418]' assert_in_out_err([], <<-"end;", ["x"]*256, [], bug11418, timeout: 60) |