matz	2007-09-05 22:18:23 +0900 (Wed, 05 Sep 2007)

  New Revision: 13343

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/string.c
    branches/ruby_1_8/version.h

  Log:
    * string.c (rb_str_splice): integer overflow for length.
      [ruby-dev:31739]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=13343&r2=13342
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=13343&r2=13342
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/string.c?r1=13343&r2=13342

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 13342)
+++ ruby_1_8/ChangeLog	(revision 13343)
@@ -1,3 +1,8 @@
+Wed Sep  5 22:02:27 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* string.c (rb_str_splice): integer overflow for length.
+	  [ruby-dev:31739]
+
 Sun Sep  2 00:48:15 2007  Tadayoshi Funaba  <tadf@d...>
 
 	* lib/date/format.rb (_parse): improved parsing of ordinal dates.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 13342)
+++ ruby_1_8/version.h	(revision 13343)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2007-09-01"
+#define RUBY_RELEASE_DATE "2007-09-05"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20070901
+#define RUBY_RELEASE_CODE 20070905
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 5
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/string.c
===================================================================
--- ruby_1_8/string.c	(revision 13342)
+++ ruby_1_8/string.c	(revision 13343)
@@ -1652,7 +1652,7 @@
 	}
 	beg += RSTRING(str)->len;
     }
-    if (RSTRING(str)->len < beg + len) {
+    if (RSTRING(str)->len < len || RSTRING(str)->len < beg + len) {
 	len = RSTRING(str)->len - beg;
     }
 

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