summaryrefslogtreecommitdiffhomepage
path: root/src/array.c
diff options
context:
space:
mode:
authorKazuki Tsujimoto <[email protected]>2012-05-03 21:16:51 +0900
committerKazuki Tsujimoto <[email protected]>2012-05-03 21:16:51 +0900
commit93f79246391864679b3f9442da55478278c51092 (patch)
treecc6bbe0387bdac992badf0862938e7f81adb5bc2 /src/array.c
parent1032e9eecc579cf3462b94ded98b40cdcb385a59 (diff)
downloadmruby-93f79246391864679b3f9442da55478278c51092.tar.gz
mruby-93f79246391864679b3f9442da55478278c51092.zip
Fix SEGV caused by using the splat operator for non arrays
Diffstat (limited to 'src/array.c')
-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