summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-02 15:32:04 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-08-02 15:32:04 +0000
commita194550e5c3076770a16b44ef3cdd1ab3cb904ed (patch)
tree863f078dcbac2feabe27064c5a486e0faa5a7d55
parent59e5d0f1779304baf931f2bd6bf82f168cbc9ef4 (diff)
* random.c (rb_random_int): arguments have to be converted to
integer. [ruby-core:24679] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24358 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--random.c5
-rw-r--r--test/ruby/test_rand.rb1
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index a2d72819554..1162d054392 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 3 00:32:00 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * random.c (rb_random_int): arguments have to be converted to
+ integer. [ruby-core:24679]
+
Sun Aug 2 21:04:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (literal_concat0): tail can be nil. [ruby-dev:38980]
diff --git a/random.c b/random.c
index 0855a1bc789..487b84a73ec 100644
--- a/random.c
+++ b/random.c
@@ -911,9 +911,10 @@ rb_random_int(VALUE obj, VALUE vmax)
if (NIL_P(v)) {
/* range like object support */
if (!(v = range_values(vmax, &beg))) {
- beg = Qundef;
- NUM2LONG(vmax);
+ v = vmax;
}
+ v = rb_to_int(v);
+ beg = rb_to_int(beg);
}
v = rand_int(&rnd->mt, v);
if (NIL_P(v)) v = INT2FIX(0);
diff --git a/test/ruby/test_rand.rb b/test/ruby/test_rand.rb
index b932128e235..39444af8ac1 100644
--- a/test/ruby/test_rand.rb
+++ b/test/ruby/test_rand.rb
@@ -344,6 +344,7 @@ END
1267650600228229401496703205383).each do |w|
assert_equal(w.to_i, r.int(2**100+5..2**100+9))
end
+ assert_equal(3, r.int(3.1..4), '[ruby-core:24679]')
end
def test_random_float