From 12539825773ddb13fac38091d13341b816ac23fa Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <boukevanderbijl@gmail.com>
Date: Mon, 14 Nov 2016 15:07:07 -0500
Subject: Fix codegen issue causing misaligned register

Reported by https://hackerone.com/haquaman
---
 mrbgems/mruby-compiler/core/codegen.c |  2 ++
 test/t/codegen.rb                     | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 test/t/codegen.rb

diff --git a/mrbgems/mruby-compiler/core/codegen.c b/mrbgems/mruby-compiler/core/codegen.c
index 0c84dd558..75adbefdd 100644
--- a/mrbgems/mruby-compiler/core/codegen.c
+++ b/mrbgems/mruby-compiler/core/codegen.c
@@ -2024,6 +2024,7 @@ codegen(codegen_scope *s, node *tree, int val)
       }
       genop(s, MKOP_sBx(OP_JMP, s->loop->pc2 - s->pc));
     }
+    if (val) push();
     break;
 
   case NODE_RETRY:
@@ -2058,6 +2059,7 @@ codegen(codegen_scope *s, node *tree, int val)
           genop(s, MKOP_sBx(OP_JMP, lp->pc1 - s->pc));
         }
       }
+      if (val) push();
     }
     break;
 
diff --git a/test/t/codegen.rb b/test/t/codegen.rb
new file mode 100644
index 000000000..89ad94bae
--- /dev/null
+++ b/test/t/codegen.rb
@@ -0,0 +1,20 @@
+##
+# Codegen tests
+
+assert('codegen absorbs arguments to redo and retry if they are the argument of a call') do
+  assert_nothing_raised do
+    a=*"1", case nil
+    when 1
+      redo |
+      1
+    end
+  end
+
+  assert_nothing_raised do
+    a=*"1", case nil
+    when 1
+      retry |
+      1
+    end
+  end
+end
-- 
cgit v1.2.3