merge revision(s) 17756:

shyouhei · shyouhei · commit 1b5e93c6f3d8 · 2008-07-01T06:10:39.000Z
* 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_6@17759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
diff --git a/ChangeLog b/ChangeLog
@@ -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.
diff --git 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
@@ -1,19 +1,20 @@
 #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[];
 RUBY_EXTERN const char ruby_release_date[];
 RUBY_EXTERN const char ruby_platform[];
 RUBY_EXTERN const int ruby_patchlevel;
 #endif
+

Original file line number	Diff line number	Diff line change
`@@ -2275,7 +2275,7 @@ rb_ary_fill(argc, argv, ary)`
`2275`	`2275`	`if (len < 0) {`
`2276`	`2276`	`return ary;`
`2277`	`2277`	`}`
`2278`		`- if (len > ARY_MAX_SIZE - beg) {`
	`2278`	`+ if (beg >= ARY_MAX_SIZE \|\| len > ARY_MAX_SIZE - beg) {`
`2279`	`2279`	`rb_raise(rb_eArgError, "argument too big");`
`2280`	`2280`	`}`
`2281`	`2281`	`end = beg + len;`