diff options
author | Nobuyoshi Nakada <nobu@ruby-lang.org> | 2020-02-11 15:52:25 +0900 |
---|---|---|
committer | NARUSE, Yui <naruse@airemix.jp> | 2020-02-13 13:50:57 +0900 |
commit | 95ab9cd8f453099d7649dc0e0eec55ea891340f5 (patch) | |
tree | 40112b9388663f98ead961974ce17e48c8d54248 /process.c | |
parent | 9c07f803db1c20241fa73e91a8a959d6cbb82e8b (diff) |
Restart timer thread even after preparation failed
If the timer thread is left stopped, memory crash or segfault can
happen. [Bug #16624]
Diffstat (limited to 'process.c')
-rw-r--r-- | process.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -2885,13 +2885,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)); |