diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-04-21 09:11:28 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2017-04-21 09:11:28 +0900 |
| commit | 94bcdca64fb08e3724c1a5cf6ce25f6f9c6e041e (patch) | |
| tree | edd6f9b14425e378b4579fa65a21df408e18c748 /src/vm.c | |
| parent | 262fbaf566cc5eb8c375adde01a427a832f8d9c2 (diff) | |
| download | mruby-94bcdca64fb08e3724c1a5cf6ce25f6f9c6e041e.tar.gz mruby-94bcdca64fb08e3724c1a5cf6ce25f6f9c6e041e.zip | |
VM stack may be reallocated in `mrb_convert_type()`; fix #3622
Diffstat (limited to 'src/vm.c')
| -rw-r--r-- | src/vm.c | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -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 */ |
