From aa77090aefa957855e69f83bbae43cea63101460 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 13 May 2007 16:54:58 +0000
Subject: * array.c (rb_ary_choice): should return nil when the array is  
 empty.

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

(limited to 'array.c')

diff --git a/array.c b/array.c
index b265d6ac79..42bda2f444 100644
--- a/array.c
+++ b/array.c
@@ -2952,9 +2952,11 @@ rb_ary_shuffle(VALUE ary)
 static VALUE
 rb_ary_choice(VALUE ary)
 {
-    long i = RARRAY_LEN(ary);
-    long j = genrand_real()*i;
+    long i, j;
 
+    i = RARRAY_LEN(ary);
+    if (i == 0) return Qnil;
+    j = genrand_real()*i;
     return RARRAY_PTR(ary)[j];
 }
 
-- 
cgit v1.2.3