summaryrefslogtreecommitdiff
path: root/eval.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-05 08:19:35 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-05 08:19:35 +0000
commit50c2a48b8502e96cfc399e80bcae939243d95395 (patch)
tree5f75c6678f5c13f59ec3dcbfb21ab4d306902ef7 /eval.c
parentb998a6dbe8e932c1922b69dfe3455e5602b52818 (diff)
* eval.c (ruby_cleanup): wrap ruby_finalize_0 by SAVE_ROOT_JMPBUF to
avoid SEGV by at_exit { Fiber.new{}.resume } on IA64. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r--eval.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/eval.c b/eval.c
index e5c8d47fe2..d85fe85ccf 100644
--- a/eval.c
+++ b/eval.c
@@ -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) {