From 94bcdca64fb08e3724c1a5cf6ce25f6f9c6e041e Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Fri, 21 Apr 2017 09:11:28 +0900 Subject: VM stack may be reallocated in `mrb_convert_type()`; fix #3622 --- src/vm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/vm.c') diff --git a/src/vm.c b/src/vm.c index dbdba6742..adc345439 100644 --- a/src/vm.c +++ b/src/vm.c @@ -1244,7 +1244,8 @@ RETRY_TRY_BLOCK: stack_extend(mrb, 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); @@ -1468,11 +1469,14 @@ RETRY_TRY_BLOCK: } blk = regs[bidx]; if (!mrb_nil_p(blk) && mrb_type(blk) != MRB_TT_PROC) { + mrb_value result; + if (bidx >= ci->nregs) { stack_extend(mrb, 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 */ -- cgit v1.2.3