admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check if OP_RETURN cross C function boundary; fix #3462

Browse Source
This commit is contained in:
Yukihiro "Matz" Matsumoto
2017-02-27 20:13:01 +09:00
parent 50bbdbb11b
commit b563bcb7ff
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vm.c
+11 -3
View File
@@ -1669,18 +1669,26 @@ RETRY_TRY_BLOCK:
/* Fall through to OP_R_NORMAL otherwise */
if (ci->acc >=0 && proc->env && !MRB_PROC_STRICT_P(proc)) {
struct REnv *e = top_env(mrb, proc);
mrb_callinfo *ce;
if (!MRB_ENV_STACK_SHARED_P(e)) {
localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
goto L_RAISE;
}
ci = mrb->c->cibase + e->cioff;
if (ci == mrb->c->cibase) {
ce = mrb->c->cibase + e->cioff;
while (--ci > ce) {
if (ci->acc < 0) {
localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
goto L_RAISE;
}
}
if (ce == mrb->c->cibase) {
localjump_error(mrb, LOCALJUMP_ERROR_RETURN);
goto L_RAISE;
}
mrb->c->stack = mrb->c->ci->stackent;
mrb->c->ci = ci;
mrb->c->ci = ce;
break;
}
case OP_R_NORMAL: