kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

random.c: coerce before check negative

Browse source 
* random.c (rb_random_ulong_limited): coerce before check negative.
  [Fixes GH-379]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-08-13 13:13:02 +00:00
parent 944c620dfa
commit 26feae3958
3 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Aug 13 22:12:59 2013 Kenichi Kamiya <kachick1@gmail.com>
* random.c (rb_random_ulong_limited): coerce before check negative.
[Fixes GH-379]
Tue Aug 13 21:52:15 2013 Kenichi Kamiya <kachick1@gmail.com>
* object.c (Init_Object): undef Module#prepend_features on Class, as

2
random.c
View file

@ -851,7 +851,7 @@ rb_random_ulong_limited(VALUE obj, unsigned long limit)
if (!rnd) {
extern int rb_num_negative_p(VALUE);
VALUE lim = ulong_to_num_plus_1(limit);
VALUE v = rb_funcall2(obj, id_rand, 1, &lim);
VALUE v = rb_to_int(rb_funcall2(obj, id_rand, 1, &lim));
unsigned long r = NUM2ULONG(v);
if (rb_num_negative_p(v)) {
rb_raise(rb_eRangeError, "random number too small %ld", r);

26
test/ruby/test_array.rb
View file

@ -2044,6 +2044,19 @@ class TestArray < Test::Unit::TestCase
alias rand call
end
assert_raise(RuntimeError) {ary.shuffle!(random: gen)}
zero = Object.new
def zero.to_int
0
end
gen_to_int = proc do |max|
zero
end
class << gen_to_int
alias rand call
end
ary = (0...10000).to_a
assert_equal(ary.rotate, ary.shuffle(random: gen_to_int))
end
def test_sample
@ -2127,6 +2140,19 @@ class TestArray < Test::Unit::TestCase
assert_equal([5000, 0, 5001, 2, 5002, 4, 5003, 6, 5004, 8, 5005], ary.sample(11, random: gen0))
ary.sample(11, random: gen1) # implementation detail, may change in the future
assert_equal([], ary)
half = Object.new
def half.to_int
5000
end
gen_to_int = proc do |max|
half
end
class << gen_to_int
alias rand call
end
ary = (0...10000).to_a
assert_equal(5000, ary.sample(random: gen_to_int))
end
def test_cycle