diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-21 14:47:02 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-21 14:47:02 +0000 |
commit | 5453b6d4a7423e4c4b949bc27da03e6667f80293 (patch) | |
tree | 7efc61d39580d58bb23212e5ba3a28e27b92a34a /array.c | |
parent | 1662bee468d632e341c48e90479d2ffe68f0fb2c (diff) |
merges r23359 from trunk into ruby_1_9_1.
--
* array.c (rb_ary_sample): negative sample number is invalid.
[ruby-core:23374]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -3302,8 +3302,9 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary) } rb_scan_args(argc, argv, "1", &nv); n = NUM2LONG(nv); - ptr = RARRAY_PTR(ary); - len = RARRAY_LEN(ary); + if (n < 0) rb_raise(rb_eArgError, "negative sample number"); + ptr = RARRAY_PTR(ary); + len = RARRAY_LEN(ary); if (n > len) n = len; switch (n) { case 0: return rb_ary_new2(0); |