summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2013-07-31 22:24:10 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2013-07-31 22:24:10 +0900
commitc550a0f834a09bbcacf1dfe62545ff256863f7e3 (patch)
treea4ace0c73c9390369a70c585d860550fd51e4659
parent016640324744a3bdf963fc276bce3b3806bd9850 (diff)
downloadmruby-c550a0f834a09bbcacf1dfe62545ff256863f7e3.tar.gz
mruby-c550a0f834a09bbcacf1dfe62545ff256863f7e3.zip
move mrb_gc_arena_restore() after cipop(); a bug found by Kilo Kawai
-rw-r--r--src/vm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vm.c b/src/vm.c
index 3cdf57551..4d99ad413 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -386,9 +386,9 @@ mrb_funcall_with_block(mrb_state *mrb, mrb_value self, mrb_sym mid, int argc, mr
if (MRB_PROC_CFUNC_P(p)) {
int ai = mrb_gc_arena_save(mrb);
val = p->body.func(mrb, self);
- mrb_gc_arena_restore(mrb, ai);
mrb->c->stack = mrb->c->stbase + mrb->c->ci->stackidx;
cipop(mrb);
+ mrb_gc_arena_restore(mrb, ai);
}
else {
val = mrb_run(mrb, p, self);