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

* array.c (rb_ary_sample): get rid of infinite loop. #455

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18718 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-08-20 03:28:34 +00:00
parent f78380f0f1
commit 6523eee836
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Aug 20 12:28:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_sample): get rid of infinite loop. #455
Wed Aug 20 06:09:31 2008 Tanaka Akira <akr@fsij.org> Wed Aug 20 06:09:31 2008 Tanaka Akira <akr@fsij.org>
* include/ruby/io.h (FMODE_TRUNC): value changed because 0x100 is used * include/ruby/io.h (FMODE_TRUNC): value changed because 0x100 is used

3
array.c
View File

@ -3032,8 +3032,9 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
return RARRAY_PTR(ary)[i]; return RARRAY_PTR(ary)[i];
} }
rb_scan_args(argc, argv, "1", &nv); rb_scan_args(argc, argv, "1", &nv);
if (len == 0) return rb_ary_new2(0);
n = NUM2INT(nv); n = NUM2INT(nv);
if (n > len) n = len;
if (n == 0) return rb_ary_new2(0);
result = rb_ary_new2(n); result = rb_ary_new2(n);
for (i=0; i<n; i++) { for (i=0; i<n; i++) {
retry: retry: