Skip to content

M
mruby
Commit 94bcdca6 authored by Yukihiro "Matz" Matsumoto's avatar Yukihiro "Matz" Matsumoto
Browse files
Options

VM stack may be reallocated in `mrb_convert_type()`; fix #3622

parent 262fbaf5
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
src/vm.c
View file @ 94bcdca6
...@@ -1244,7 +1244,8 @@ RETRY_TRY_BLOCK: ...@@ -1244,7 +1244,8 @@ RETRY_TRY_BLOCK:
stack_extend(mrb, bidx+1); stack_extend(mrb, bidx+1);
mrb->c->ci->nregs = bidx+1; mrb->c->ci->nregs = bidx+1;
} }
regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc"); result = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
regs[bidx] = result;
} }
} }
c = mrb_class(mrb, recv); c = mrb_class(mrb, recv);
...@@ -1468,11 +1469,14 @@ RETRY_TRY_BLOCK: ...@@ -1468,11 +1469,14 @@ RETRY_TRY_BLOCK:
} }
blk = regs[bidx]; blk = regs[bidx];
if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) { if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) {
mrb_value result;
if (bidx >= ci->nregs) { if (bidx >= ci->nregs) {
stack_extend(mrb, bidx+1); stack_extend(mrb, bidx+1);
ci->nregs = bidx+1; ci->nregs = bidx+1;
} }
regs[bidx] = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc"); result = mrb_convert_type(mrb, blk, MRB_TT_PROC, "Proc", "to_proc");
regs[bidx] = result;
} }
/* push callinfo */ /* push callinfo */
......
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