From dafbab6cff8c384c9836d3843b8dca6220ab6fbe Mon Sep 17 00:00:00 2001 From: matz 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: http://svn.ruby-lang.org/repos/ruby/trunk@12276 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ array.c | 6 ++++-- version.h | 6 +++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d649359c8..ae15ce9ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon May 14 01:54:15 2007 Yukihiro Matsumoto + + * array.c (rb_ary_choice): should return nil when the array is + empty. + Sat May 12 18:26:36 2007 Minero Aoki * lib/net/http.rb (tokens): forgot to add strip. [ruby-core:11120] diff --git a/array.c b/array.c index b265d6ac7..42bda2f44 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]; } diff --git a/version.h b/version.h index 57bbe63d6..7d6f4ba8e 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-05-12" +#define RUBY_RELEASE_DATE "2007-05-14" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070512 +#define RUBY_RELEASE_CODE 20070514 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 14 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- cgit