3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index e7cd08431d..0d30d1bc6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep  5 22:02:27 2007  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* string.c (rb_str_splice): integer overflow for length.
+	  [ruby-dev:31739]
+
 Sun Sep  2 00:48:15 2007  Tadayoshi Funaba  <tadf@dotrb.org>
 
 	* lib/date/format.rb (_parse): improved parsing of ordinal dates.
diff --git a/string.c b/string.c
index ea87e491cb..cc27550ebe 100644
--- a/string.c
+++ b/string.c
@@ -1652,7 +1652,7 @@ rb_str_splice(str, beg, len, val)
 	}
 	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;
     }
 
diff --git a/version.h b/version.h
index c60e2151e0..dc7dbf59ed 100644
--- a/version.h
+++ b/version.h
@@ -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[];