summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2012-05-05 08:54:37 -0700
committerYukihiro "Matz" Matsumoto <[email protected]>2012-05-05 08:54:37 -0700
commit6f532a012208ff3da3c7b675f4886ce4dc4681c3 (patch)
tree3b7731f1a4d4697b87e7a6e9327550a080c58515
parent88d7697cfef1b3e5fd6e4c4777a759c64c6380d1 (diff)
parent93f79246391864679b3f9442da55478278c51092 (diff)
downloadmruby-6f532a012208ff3da3c7b675f4886ce4dc4681c3.tar.gz
mruby-6f532a012208ff3da3c7b675f4886ce4dc4681c3.zip
Merge pull request #93 from k-tsj/fix-splat-segv
Fix SEGV caused by using the splat operator for non arrays
-rw-r--r--src/array.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/array.c b/src/array.c
index 249ae8d8c..b28bc7f3f 100644
--- a/src/array.c
+++ b/src/array.c
@@ -725,7 +725,12 @@ mrb_ary_rindex_m(mrb_state *mrb, mrb_value self)
mrb_value
mrb_ary_splat(mrb_state *mrb, mrb_value v)
{
- return v;
+ if (mrb_type(v) == MRB_TT_ARRAY) {
+ return v;
+ }
+ else {
+ return mrb_ary_new_from_values(mrb, &v, 1);
+ }
}
static mrb_value