diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 8 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon May 5 17:17:40 2008 Tanaka Akira <akr@fsij.org> + + * eval.c (ruby_cleanup): wrap ruby_finalize_0 by SAVE_ROOT_JMPBUF to + avoid SEGV by at_exit { Fiber.new{}.resume } on IA64. + Mon May 5 12:12:11 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * array.c (rb_ary_slice_bang): should adjust length before making @@ -164,7 +164,13 @@ ruby_cleanup(int ex) errs[1] = th->errinfo; th->safe_level = 0; Init_stack((void *)&state); - ruby_finalize_0(); + + PUSH_TAG(); + if ((state = EXEC_TAG()) == 0) { + SAVE_ROOT_JMPBUF(th, ruby_finalize_0()); + } + POP_TAG(); + errs[0] = th->errinfo; PUSH_TAG(); if ((state = EXEC_TAG()) == 0) { |