The operand of `OP_ARYDUP` may not be an array; fix #4094

This commit also fix #4096.

The operand of `OP_ARYDUP` may not be an array; fix #4094
This commit also fix #4096.
2c93e4a0 · Yukihiro "Matz" Matsumoto · f76cc483 · 2c93e4a0
Commit 2c93e4a0 authored Aug 30, 2018 by Yukihiro "Matz" Matsumoto
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

src/vm.c src/vm.c +6 -1

No files found.
--- a/src/vm.c
+++ b/src/vm.c
@@ -2618,7 +2618,12 @@ RETRY_TRY_BLOCK:

    CASE(OP_ARYDUP, B) {
      mrb_value ary = regs[a];
-      ary = mrb_ary_new_from_values(mrb, RARRAY_LEN(ary), RARRAY_PTR(ary));
+      if (mrb_array_p(ary)) {
+        ary = mrb_ary_new_from_values(mrb, RARRAY_LEN(ary), RARRAY_PTR(ary));
+      }
+      else {
+        ary = mrb_ary_new_from_values(mrb, 1, &ary);
+      }
      regs[a] = ary;
      NEXT;
    }