summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/vm.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/vm.c b/src/vm.c
index f8c2d510f..7edbdf3cb 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -2019,8 +2019,15 @@ RETRY_TRY_BLOCK:
if (!MRB_PROC_ENV_P(proc) || !MRB_ENV_STACK_SHARED_P(MRB_PROC_ENV(proc))) {
goto L_BREAK_ERROR;
}
- if (MRB_PROC_ENV(proc)->cxt != mrb->c) {
- goto L_BREAK_ERROR;
+ else {
+ struct REnv *e = MRB_PROC_ENV(proc);
+
+ if (e == mrb->c->cibase->env && proc != mrb->c->cibase->proc) {
+ goto L_BREAK_ERROR;
+ }
+ if (e->cxt != mrb->c) {
+ goto L_BREAK_ERROR;
+ }
}
while (mrb->c->eidx > mrb->c->ci->epos) {
ecall_adjust();