summaryrefslogtreecommitdiff
path: root/eval_jump.c
diff options
context:
space:
mode:
authorglass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-15 15:29:23 (GMT)
committerglass <glass@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-11-15 15:29:23 (GMT)
commit77a5f5b57b3aed623a7aaed65e03f3ebc4070137 (patch)
tree3410f733bdb68c4836305465b4257357fa29c2df /eval_jump.c
parent549b35c1dc771d233a72466a6cae8363908f3350 (diff)
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval_jump.c')
-rw-r--r--eval_jump.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/eval_jump.c b/eval_jump.c
index 092ab87..fc8a830 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;
}