From 6523eee836cc3253253fd5a814c6784cd8b8c99c Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 20 Aug 2008 03:28:34 +0000
Subject: * array.c (rb_ary_sample): get rid of infinite loop.  #455

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18718 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 array.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'array.c')

diff --git a/array.c b/array.c
index 0b7427cf91..d3dbde40d8 100644
--- a/array.c
+++ b/array.c
@@ -3032,8 +3032,9 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary)
 	return RARRAY_PTR(ary)[i];
     }
     rb_scan_args(argc, argv, "1", &nv);
-    if (len == 0) return rb_ary_new2(0);
     n = NUM2INT(nv);
+    if (n > len) n = len;
+    if (n == 0) return rb_ary_new2(0);
     result = rb_ary_new2(n);
     for (i=0; i<n; i++) {
       retry:
-- 
cgit v1.2.3