merge revision(s) 17756:

	* array.c (rb_ary_fill): check if beg is too big.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@17761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 11 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 24035d8323..d98c602d5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul  1 15:11:14 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* array.c (rb_ary_fill): check if beg is too big.
+
 Mon Jun 30 20:35:32 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (str_buf_cat): check for self concatenation.
diff --git a/array.c b/array.c
index 9eda004130..7e8c12b683 100644
--- a/array.c
+++ b/array.c
@@ -2419,7 +2419,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 11263a3043..c3b3b554e5 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-06-30"
+#define RUBY_RELEASE_DATE "2008-07-01"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080630
-#define RUBY_PATCHLEVEL 39
+#define RUBY_RELEASE_CODE 20080701
+#define RUBY_PATCHLEVEL 40
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #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[];
@@ -27,3 +27,4 @@ RUBY_EXTERN const char *ruby_copyright;
 
 #define RUBY_RELEASE_STR "patchlevel"
 #define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
+