archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 42542: [Backport #8910]

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/branches/ruby_2_0_0@43079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2013-09-28 13:04:48 +00:00
parent 87791df311
commit e5bcf05d66
4 changed files with 35 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Sep 28 21:40:40 2013 Kenichi Kamiya <kachick1@gmail.com>
* random.c (rb_random_ulong_limited): coerce before check negative.
[Fixes GH-379]
Fri Sep 27 01:24:20 2013 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* lib/rubygems: Update to Rubygems 2.0.10. [ruby-core:57360]

2
random.c
View file

@ -965,7 +965,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

@ -2020,6 +2020,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
@ -2103,6 +2116,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

6
version.h
View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2013-09-27"
#define RUBY_PATCHLEVEL 321
#define RUBY_RELEASE_DATE "2013-09-28"
#define RUBY_PATCHLEVEL 322
#define RUBY_RELEASE_YEAR 2013
#define RUBY_RELEASE_MONTH 9
#define RUBY_RELEASE_DAY 27
#define RUBY_RELEASE_DAY 28
#include "ruby/version.h"