Merge pull request #3318 from bouk/splat-stack

Fix stack move segfaulting in OP_ARYCAT

Merge pull request #3318 from bouk/splat-stack
Fix stack move segfaulting in OP_ARYCAT
6ec14a21 · Yukihiro "Matz" Matsumoto · GitHub · 43512cc7 · 7d07466b · 6ec14a21
Commit 6ec14a21 authored Dec 05, 2016 by Yukihiro "Matz" Matsumoto Committed by GitHub Dec 05, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

src/vm.c src/vm.c +2 -2

No files found.
--- a/src/vm.c
+++ b/src/vm.c
@@ -2161,8 +2161,8 @@ RETRY_TRY_BLOCK:
    CASE(OP_ARYCAT) {
      /* A B            mrb_ary_concat(R(A),R(B)) */
-      mrb_ary_concat(mrb, regs[GETARG_A(i)],
+      mrb_value splat = mrb_ary_splat(mrb, regs[GETARG_B(i)]);
-                     mrb_ary_splat(mrb, regs[GETARG_B(i)]));
+      mrb_ary_concat(mrb, regs[GETARG_A(i)], splat);
      ARENA_RESTORE(mrb, ai);
      NEXT;
    }