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

mruby · Apr 21, 2017 · 94bcdca · 94bcdca
1 parent 262fbaf
commit 94bcdca
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/vm.c b/src/vm.c
@@ -1244,7 +1244,8 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
             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 @@ mrb_vm_exec(mrb_state *mrb, struct RProc *proc, mrb_code *pc)
       }
       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 */