From 0dd9a0fd6a24399852e7dda3f87700bb6f283574 Mon Sep 17 00:00:00 2001
From: Masamitsu MURASE <masamitsu.murase@gmail.com>
Date: Sat, 19 Jan 2013 23:15:20 +0900
Subject: Modify handling of OP_ENTER.

If `argc` is `-1`, `block` parameter is sometimes overwritten.
---
 src/vm.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/vm.c')

diff --git a/src/vm.c b/src/vm.c
index 8ae28ef5e..696b566c8 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1121,6 +1121,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
       }
       else {
         if (argv0 != argv) {
+          regs[len+1] = *blk; /* move block */
           memmove(&regs[1], argv, sizeof(mrb_value)*(m1+o)); /* m1 + o */
         }
         if (r) {                  /* r */
@@ -1129,7 +1130,9 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
         if (m2) {
           memmove(&regs[m1+o+r+1], &argv[argc-m2], sizeof(mrb_value)*m2);
         }
-        regs[len+1] = *blk; /* move block */
+        if (argv0 == argv) {
+          regs[len+1] = *blk; /* move block */
+        }
         pc += o + 1;
       }
       JUMP;
-- 
cgit v1.2.3