shyouhei	2008-07-01 15:14:29 +0900 (Tue, 01 Jul 2008)

  New Revision: 17761

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/array.c
    branches/ruby_1_8_7/version.h

  Log:
    merge revision(s) 17756:
    * array.c (rb_ary_fill): check if beg is too big.



  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=17761

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=17761&r2=17760&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17761&r2=17760&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/array.c?r1=17761&r2=17760&diff_format=u

Index: ruby_1_8_7/array.c
===================================================================
--- ruby_1_8_7/array.c	(revision 17760)
+++ ruby_1_8_7/array.c	(revision 17761)
@@ -2419,7 +2419,7 @@
     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;
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17760)
+++ ruby_1_8_7/ChangeLog	(revision 17761)
@@ -1,3 +1,7 @@
+Tue Jul  1 15:11:14 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* array.c (rb_ary_fill): check if beg is too big.
+
 Mon Jun 30 20:35:32 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* string.c (str_buf_cat): check for self concatenation.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17760)
+++ ruby_1_8_7/version.h	(revision 17761)
@@ -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 @@
 
 #define RUBY_RELEASE_STR "patchlevel"
 #define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
+

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/