diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | eval_jump.c | 15 | ||||
| -rw-r--r-- | test/ruby/test_beginendblock.rb | 12 |
3 files changed, 33 insertions, 1 deletions
@@ -1,3 +1,10 @@ +Sat Nov 16 00:18:36 2013 Masaki Matsushita <glass.saga@gmail.com> + + * eval_jump.c (rb_exec_end_proc): fix double free or corruption error + when reentering by callcc. [ruby-core:58329] [Bug #9110] + + * test/ruby/test_beginendblock.rb: test for above. + Fri Nov 15 22:21:34 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> * hash.c (hash_foreach_iter, hash_foreach_ensure, rb_hash_foreach): diff --git a/eval_jump.c b/eval_jump.c index 092ab8766a..fc8a830575 100644 --- a/eval_jump.c +++ b/eval_jump.c @@ -97,6 +97,8 @@ void rb_exec_end_proc(void) { struct end_proc_data *volatile link; + struct end_proc_data *ephemeral_end_procs_head = ephemeral_end_procs; + struct end_proc_data *end_procs_head = end_procs; int status; volatile int safe = rb_safe_level(); rb_thread_t *th = GET_THREAD(); @@ -116,7 +118,6 @@ rb_exec_end_proc(void) error_handle(status); if (!NIL_P(th->errinfo)) errinfo = th->errinfo; } - xfree(link); } while (end_procs) { @@ -133,8 +134,20 @@ rb_exec_end_proc(void) error_handle(status); if (!NIL_P(th->errinfo)) errinfo = th->errinfo; } + } + + link = ephemeral_end_procs_head; + while (link) { xfree(link); + link = link->next; } + + link = end_procs_head; + while (link) { + xfree(link); + link = link->next; + } + rb_set_safe_level_force(safe); th->errinfo = errinfo; } diff --git a/test/ruby/test_beginendblock.rb b/test/ruby/test_beginendblock.rb index 0543476875..4e9a4b72b9 100644 --- a/test/ruby/test_beginendblock.rb +++ b/test/ruby/test_beginendblock.rb @@ -173,4 +173,16 @@ EOW assert_equal(["", "", 42], [out, err, status.exitstatus], "#{bug5218}: #{ex}") end end + + def test_callcc_at_exit + bug9110 = '[ruby-core:58329][Bug #9110]' + ruby = EnvUtil.rubybin + script = <<EOS +require "continuation" +c = nil +at_exit { c.call } +at_exit { callcc {|_c| c = _c } } +EOS + assert system(ruby, "-e", script) + end end |