From bfd2a539edab8ef7935a75de8a6885d74ff9e8ef Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Wed, 26 Mar 2014 01:09:09 +0900 Subject: add new function mrb_toplevel_run to prevent running through C function boudaries on exceptions; close #1942 --- src/vm.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/vm.c') diff --git a/src/vm.c b/src/vm.c index 8504cc34c..505f3f955 100644 --- a/src/vm.c +++ b/src/vm.c @@ -2270,3 +2270,20 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self) { return mrb_context_run(mrb, proc, self, mrb->c->ci->argc + 2); /* argc + 2 (receiver and block) */ } + +mrb_value +mrb_toplevel_run(mrb_state *mrb, struct RProc *proc) +{ + mrb_callinfo *ci; + mrb_value v; + + if (!mrb->c->cibase || mrb->c->ci == mrb->c->cibase) { + return mrb_context_run(mrb, proc, mrb_top_self(mrb), 0); + } + ci = cipush(mrb); + ci->acc = CI_ACC_SKIP; + v = mrb_context_run(mrb, proc, mrb_top_self(mrb), 0); + cipop(mrb); + + return v; +} -- cgit v1.2.3