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

random.c: ArgumentError for invalid argument

Browse Source 
* random.c (rand_random_number): raise ArgumentError for invalid
  argument like as SecureRandom.random_number.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-02-14 05:40:10 +00:00
parent dd09b5bf1d
commit 10a9807030
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
random.c
View File

@ -1077,6 +1077,19 @@ invalid_argument(VALUE arg0)
rb_raise(rb_eArgError, "invalid argument - %"PRIsVALUE, arg0); rb_raise(rb_eArgError, "invalid argument - %"PRIsVALUE, arg0);
} }
static VALUE
check_random_number(VALUE v, const VALUE *argv)
{
switch (v) {
case Qfalse:
(void)NUM2LONG(argv[0]);
break;
case Qnil:
invalid_argument(argv[0]);
}
return v;
}
static inline double static inline double
float_value(VALUE v) float_value(VALUE v)
{ {
@ -1198,7 +1211,7 @@ static VALUE
random_rand(int argc, VALUE *argv, VALUE obj) random_rand(int argc, VALUE *argv, VALUE obj)
{ {
VALUE v = rand_random(argc, argv, obj, get_rnd(obj)); VALUE v = rand_random(argc, argv, obj, get_rnd(obj));
if (NIL_P(v)) invalid_argument(argv[0]); check_random_number(v, argv);
return v; return v;
} }
@ -1242,8 +1255,7 @@ rand_random(int argc, VALUE *argv, VALUE obj, rb_random_t *rnd)
/* nothing to do */ /* nothing to do */
} }
else { else {
v = Qnil; return Qfalse;
(void)NUM2LONG(vmax);
} }
return v; return v;
} }
@ -1254,6 +1266,7 @@ rand_random_number(int argc, VALUE *argv, VALUE obj)
rb_random_t *rnd = try_get_rnd(obj); rb_random_t *rnd = try_get_rnd(obj);
VALUE v = rand_random(argc, argv, obj, rnd); VALUE v = rand_random(argc, argv, obj, rnd);
if (NIL_P(v)) v = rand_random(0, 0, obj, rnd); if (NIL_P(v)) v = rand_random(0, 0, obj, rnd);
else if (!v) invalid_argument(argv[0]);
return v; return v;
} }
@ -1358,7 +1371,7 @@ static VALUE
random_s_rand(int argc, VALUE *argv, VALUE obj) random_s_rand(int argc, VALUE *argv, VALUE obj)
{ {
VALUE v = rand_random(argc, argv, Qnil, rand_start(&default_rand)); VALUE v = rand_random(argc, argv, Qnil, rand_start(&default_rand));
if (NIL_P(v)) invalid_argument(argv[0]); check_random_number(v, argv);
return v; return v;
} }