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: allow negative argument to random_number

Browse source 
* random.c (rand_random_number): allow negative argument as it is
  allowed by SecureRandom.random_number.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-02-14 04:11:26 +00:00
parent b1adbd14e5
commit dd09b5bf1d
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
random.c
View file

@ -1070,6 +1070,13 @@ domain_error(void)
rb_exc_raise(rb_class_new_instance(1, &error, rb_eSystemCallError)); rb_exc_raise(rb_class_new_instance(1, &error, rb_eSystemCallError));
} }
NORETURN(static void invalid_argument(VALUE));
static void
invalid_argument(VALUE arg0)
{
rb_raise(rb_eArgError, "invalid argument - %"PRIsVALUE, arg0);
}
static inline double static inline double
float_value(VALUE v) float_value(VALUE v)
{ {
@ -1190,7 +1197,9 @@ static VALUE rand_random(int argc, VALUE *argv, VALUE obj, rb_random_t *rnd);
static VALUE static VALUE
random_rand(int argc, VALUE *argv, VALUE obj) random_rand(int argc, VALUE *argv, VALUE obj)
{ {
return 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]);
return v;
} }
static VALUE static VALUE
@ -1236,18 +1245,16 @@ rand_random(int argc, VALUE *argv, VALUE obj, rb_random_t *rnd)
v = Qnil; v = Qnil;
(void)NUM2LONG(vmax); (void)NUM2LONG(vmax);
} }
if (NIL_P(v)) {
rb_raise(rb_eArgError, "invalid argument - %"PRIsVALUE, argv[0]);
}
return v; return v;
} }
static VALUE static VALUE
rand_random_number(int argc, VALUE *argv, VALUE obj) rand_random_number(int argc, VALUE *argv, VALUE obj)
{ {
if (argc == 1 && argv[0] == INT2FIX(0)) --argc; rb_random_t *rnd = try_get_rnd(obj);
return rand_random(argc, argv, obj, try_get_rnd(obj)); VALUE v = rand_random(argc, argv, obj, rnd);
if (NIL_P(v)) v = rand_random(0, 0, obj, rnd);
return v;
} }
/* /*
@ -1350,7 +1357,9 @@ rb_f_rand(int argc, VALUE *argv, VALUE obj)
static VALUE static VALUE
random_s_rand(int argc, VALUE *argv, VALUE obj) random_s_rand(int argc, VALUE *argv, VALUE obj)
{ {
return 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]);
return v;
} }
#define SIP_HASH_STREAMING 0 #define SIP_HASH_STREAMING 0