Skip to content

M
mruby
Commit 0419f079 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

Add `NULL` checks for `mrb->ci` and `proc->upeer`; #4024

parent f2084f30
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 6 deletions
src/proc.c
View file @ 0419f079
...@@ -63,12 +63,12 @@ closure_setup(mrb_state *mrb, struct RProc *p) ...@@ -63,12 +63,12 @@ closure_setup(mrb_state *mrb, struct RProc *p)
{ {
mrb_callinfo *ci = mrb->c->ci; mrb_callinfo *ci = mrb->c->ci;
struct RProc *up = p->upper; struct RProc *up = p->upper;
struct REnv *e; struct REnv *e = NULL;
if (ci->env) { if (ci && ci->env) {
e = ci->env; e = ci->env;
} }
else { else if (up) {
struct RClass *tc = MRB_PROC_TARGET_CLASS(p); struct RClass *tc = MRB_PROC_TARGET_CLASS(p);
e = env_new(mrb, up->body.irep->nlocals); e = env_new(mrb, up->body.irep->nlocals);
...@@ -78,9 +78,11 @@ closure_setup(mrb_state *mrb, struct RProc *p) ...@@ -78,9 +78,11 @@ closure_setup(mrb_state *mrb, struct RProc *p)
mrb_field_write_barrier(mrb, (struct RBasic*)e, (struct RBasic*)tc); mrb_field_write_barrier(mrb, (struct RBasic*)e, (struct RBasic*)tc);
} }
} }
p->e.env = e; if (e) {
p->flags |= MRB_PROC_ENVSET; p->e.env = e;
mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)e); p->flags |= MRB_PROC_ENVSET;
mrb_field_write_barrier(mrb, (struct RBasic*)p, (struct RBasic*)e);
}
} }
struct RProc* struct RProc*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment