@@ -1,3 +1,7 @@ +Tue Jul 1 15:09:37 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * array.c (rb_ary_fill): check if beg is too big. + Mon Jun 30 20:34:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (str_buf_cat): check for self concatenation. ChangeLog @@ -2275,7 +2275,7 @@ rb_ary_fill(argc, argv, ary) if (len < 0) { return ary; } - if (len > ARY_MAX_SIZE - beg) { + if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) { rb_raise(rb_eArgError, "argument too big"); } end = beg + len; array.c @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-06-30" +#define RUBY_RELEASE_DATE "2008-07-01" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080630 -#define RUBY_PATCHLEVEL 256 +#define RUBY_RELEASE_CODE 20080701 +#define RUBY_PATCHLEVEL 257 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2008 -#define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 30 +#define RUBY_RELEASE_MONTH 7 +#define RUBY_RELEASE_DAY 1 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; @@ -17,3 +17,4 @@ RUBY_EXTERN const char ruby_release_date[]; RUBY_EXTERN const char ruby_platform[]; RUBY_EXTERN const int ruby_patchlevel; #endif + version.h ebc1bf7b116c83a8b797e02949fbbad2797d365a shyouhei shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e http://github.com/FooBarWidget/rubyenterpriseedition/commit/81054f9873d0293cfc436793b01f0caf4127fdf1 81054f9873d0293cfc436793b01f0caf4127fdf1 2008-06-30T23:10:39-07:00 2008-06-30T23:10:39-07:00 merge revision(s) 17756: * array.c (rb_ary_fill): check if beg is too big. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e 405681487f9dbd1bb353007259fc2b039961f8d1 shyouhei shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e