2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ed6fc14aa..39e07c7798 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
 	* include/ruby/io.h (FMODE_TRUNC): value changed because 0x100 is used
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: