Merge pull request mruby#2883 from jbreeden/array_join_nil

matz · matz · commit 4dac03cb2d53 · 2015-07-12T22:42:18.000+09:00
Patching array join
diff --git a/src/array.c b/src/array.c
@@ -295,7 +295,7 @@ mrb_ary_plus(mrb_state *mrb, mrb_value self)
 
   mrb_get_args(mrb, "a", &ptr, &blen);
   if (ARY_MAX_SIZE - blen < a1->len) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big"); 
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
   }
   a2 = ary_new_capa(mrb, a1->len + blen);
   array_copy(a2->ptr, a1->ptr, a1->len);
@@ -349,7 +349,7 @@ mrb_ary_times(mrb_state *mrb, mrb_value self)
   }
   if (times == 0) return mrb_ary_new(mrb);
   if (ARY_MAX_SIZE / times < a1->len) {
-    mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big"); 
+    mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");
   }
   a2 = ary_new_capa(mrb, a1->len * times);
   ptr = a2->ptr;
@@ -1031,7 +1031,11 @@ mrb_ary_join_m(mrb_state *mrb, mrb_value ary)
 {
   mrb_value sep = mrb_nil_value();
 
-  mrb_get_args(mrb, "|S", &sep);
+  mrb_get_args(mrb, "|o", &sep);
+  if (!(mrb_nil_p(sep) || mrb_type(sep) == MRB_TT_STRING)) {
+    mrb_raise(mrb, E_TYPE_ERROR, "expected String");
+    return mrb_nil_value();
+  }
   return mrb_ary_join(mrb, ary, sep);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ mrb_ary_plus(mrb_state *mrb, mrb_value self)`
`295`	`295`
`296`	`296`	`mrb_get_args(mrb, "a", &ptr, &blen);`
`297`	`297`	`if (ARY_MAX_SIZE - blen < a1->len) {`
`298`		`- mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");`
	`298`	`+ mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");`
`299`	`299`	`}`
`300`	`300`	`a2 = ary_new_capa(mrb, a1->len + blen);`
`301`	`301`	`array_copy(a2->ptr, a1->ptr, a1->len);`
`@@ -349,7 +349,7 @@ mrb_ary_times(mrb_state *mrb, mrb_value self)`
`349`	`349`	`}`
`350`	`350`	`if (times == 0) return mrb_ary_new(mrb);`
`351`	`351`	`if (ARY_MAX_SIZE / times < a1->len) {`
`352`		`- mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");`
	`352`	`+ mrb_raise(mrb, E_ARGUMENT_ERROR, "array size too big");`
`353`	`353`	`}`
`354`	`354`	`a2 = ary_new_capa(mrb, a1->len * times);`
`355`	`355`	`ptr = a2->ptr;`
`@@ -1031,7 +1031,11 @@ mrb_ary_join_m(mrb_state *mrb, mrb_value ary)`
`1031`	`1031`	`{`
`1032`	`1032`	`mrb_value sep = mrb_nil_value();`
`1033`	`1033`
`1034`		`- mrb_get_args(mrb, "\|S", &sep);`
	`1034`	`+ mrb_get_args(mrb, "\|o", &sep);`
	`1035`	`+ if (!(mrb_nil_p(sep) \|\| mrb_type(sep) == MRB_TT_STRING)) {`
	`1036`	`+ mrb_raise(mrb, E_TYPE_ERROR, "expected String");`
	`1037`	`+ return mrb_nil_value();`
	`1038`	`+ }`
`1035`	`1039`	`return mrb_ary_join(mrb, ary, sep);`
`1036`	`1040`	`}`
`1037`	`1041`