aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-26 00:49:54 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-26 00:49:54 +0000
commit7e4015e16d3d3c5780440a9d15af4bcae8d4e4e1 (patch)
tree7455d5ee23e1fe42ed65f0342225b2d360d130b1
parent3dc6edf793c33483c9d7365b865152d57fa994fb (diff)
downloadruby-7e4015e16d3d3c5780440a9d15af4bcae8d4e4e1.tar.gz
* array.c (rb_ary_shuffle_bang): check number of argument.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--array.c3
-rw-r--r--test/ruby/test_array.rb1
3 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4865ea32c7..5381342154 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Aug 26 09:49:50 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * array.c (rb_ary_shuffle_bang): check number of argument.
+
Tue Aug 26 09:11:40 2010 Kenta Murata <mrkn@mrkn.jp>
* ext/bigdecimal/bigdecimal.c (Init_bigdecimal,
diff --git a/array.c b/array.c
index a21f9ef51e..a2083210d3 100644
--- a/array.c
+++ b/array.c
@@ -3754,6 +3754,9 @@ rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary)
if (OPTHASH_GIVEN_P(opts)) {
randgen = rb_hash_lookup2(opts, sym_random, randgen);
}
+ if (argc > 0) {
+ rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
+ }
rb_ary_modify(ary);
ptr = RARRAY_PTR(ary);
while (i) {
diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb
index 4a8b700c77..4c3aba0589 100644
--- a/test/ruby/test_array.rb
+++ b/test/ruby/test_array.rb
@@ -1893,6 +1893,7 @@ class TestArray < Test::Unit::TestCase
end
gen = Random.new(0)
+ assert_raise(ArgumentError) {[1, 2, 3].shuffle(1, random: gen)}
srand(0)
100.times do
assert_equal([0, 1, 2].shuffle, [0, 1, 2].shuffle(random: gen))