From ecbdd8fcad2bb0732589a0841c8f68d9ca369caf Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 18 Nov 2013 13:45:51 +0000 Subject: [PATCH] eval_jump.c: refix [Bug #9110] * eval_jump.c (rb_exec_end_proc): unlink and free procs data before calling for each procs. [Bug #9110] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ eval_jump.c | 23 ++++++++--------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index ed7b8067e2..037357b3d6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Nov 18 22:45:49 2013 Nobuyoshi Nakada + + * eval_jump.c (rb_exec_end_proc): unlink and free procs data before + calling for each procs. [Bug #9110] + Sun Nov 17 06:33:32 2013 Shota Fukumori * configure.in: Use $LIBS for base of $SOLIBS, also in darwin. diff --git a/eval_jump.c b/eval_jump.c index fc8a830575..24bf2a2286 100644 --- a/eval_jump.c +++ b/eval_jump.c @@ -96,9 +96,8 @@ rb_mark_end_proc(void) 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; + struct end_proc_data volatile endproc; + struct end_proc_data volatile *link; int status; volatile int safe = rb_safe_level(); rb_thread_t *th = GET_THREAD(); @@ -107,6 +106,9 @@ rb_exec_end_proc(void) while (ephemeral_end_procs) { link = ephemeral_end_procs; ephemeral_end_procs = link->next; + endproc = *link; + xfree((void *)link); + link = &endproc; PUSH_TAG(); if ((status = EXEC_TAG()) == 0) { @@ -123,6 +125,9 @@ rb_exec_end_proc(void) while (end_procs) { link = end_procs; end_procs = link->next; + endproc = *link; + xfree((void *)link); + link = &endproc; PUSH_TAG(); if ((status = EXEC_TAG()) == 0) { @@ -136,18 +141,6 @@ rb_exec_end_proc(void) } } - 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; }