matz	2007-09-05 22:06:01 +0900 (Wed, 05 Sep 2007)

  New Revision: 13342

  Modified files:
    trunk/ChangeLog
    trunk/string.c
    trunk/version.h

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

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13341)
+++ ChangeLog	(revision 13342)
@@ -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]
+
 Tue Sep  4 20:43:44 2007  Masaki Suketa  <masaki.suketa@n...>
 
 	* ext/win32ole/win32ole.c: add WIN32OLE_EVENT#unadvise.
Index: string.c
===================================================================
--- string.c	(revision 13341)
+++ string.c	(revision 13342)
@@ -1893,7 +1893,7 @@
 	}
 	beg += slen;
     }
-    if (slen < beg + len) {
+    if (slen < len || slen < beg + len) {
 	len = slen - beg;
     }
     p = str_nth(RSTRING_PTR(str), RSTRING_END(str), beg, enc);
Index: version.h
===================================================================
--- version.h	(revision 13341)
+++ version.h	(revision 13342)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-09-04"
+#define RUBY_RELEASE_DATE "2007-09-05"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070904
+#define RUBY_RELEASE_CODE 20070905
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 4
+#define RUBY_RELEASE_DAY 5
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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