1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* array.c (rb_ary_sample): negative sample number is invalid.

Browse Source 
[ruby-core:23374]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-05-07 05:26:16 +00:00
parent 013b277316
commit 9936642c40
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu May 7 14:26:14 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_sample): negative sample number is invalid.
[ruby-core:23374]
Thu May 7 14:16:24 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c, include/ruby/encoding.h: fixed types.

1
array.c
View File

@ -3450,6 +3450,7 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
}
rb_scan_args(argc, argv, "1", &nv);
n = NUM2LONG(nv);
if (n < 0) rb_raise(rb_eArgError, "negative sample number");
ptr = RARRAY_PTR(ary);
len = RARRAY_LEN(ary);
if (n > len) n = len;

2
test/ruby/test_array.rb
View File

@ -1605,6 +1605,8 @@ class TestArray < Test::Unit::TestCase
end
assert_operator(h.values.min * 2, :>=, h.values.max) if n != 0
end
assert_raise(ArgumentError, '[ruby-core:23374]') {[1, 2].sample(-1)}
end
def test_cycle