From 81054f9873d0293cfc436793b01f0caf4127fdf1 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Tue, 1 Jul 2008 06:10:39 +0000 Subject: 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 --- ChangeLog | 4 ++++ array.c | 2 +- version.h | 11 ++++++----- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 12b8581b0..2a4026777 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jul 1 15:09:37 2008 Nobuyoshi Nakada + + * array.c (rb_ary_fill): check if beg is too big. + Mon Jun 30 20:34:05 2008 Nobuyoshi Nakada * string.c (str_buf_cat): check for self concatenation. diff --git a/array.c b/array.c index 138726999..503a7adba 100644 --- a/array.c +++ b/array.c @@ -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; diff --git a/version.h b/version.h index b822eae6d..48751f207 100644 --- a/version.h +++ b/version.h @@ -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 + -- cgit