matz	2008-05-13 10:19:41 +0900 (Tue, 13 May 2008)

  New Revision: 16400

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

  Log:
    * string.c (rb_str_cat): fixed buffer overrun reported by
      Christopher Thompson <cthompson at nexopia.com> in [ruby-core:16746]

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

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 16399)
+++ ruby_1_8/ChangeLog	(revision 16400)
@@ -1,3 +1,8 @@
+Tue May 13 07:56:36 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* string.c (rb_str_cat): fixed buffer overrun reported by
+	  Christopher Thompson <cthompson at nexopia.com> in [ruby-core:16746]
+
 Mon May 12 13:57:19 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* eval.c (is_defined): add NODE_OP_ASGN_{OR,AND}.  "defined?(a||=1)"
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 16399)
+++ ruby_1_8/version.h	(revision 16400)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-05-12"
+#define RUBY_RELEASE_DATE "2008-05-13"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080512
+#define RUBY_RELEASE_CODE 20080513
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 13
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/string.c
===================================================================
--- ruby_1_8/string.c	(revision 16399)
+++ ruby_1_8/string.c	(revision 16400)
@@ -761,7 +761,7 @@
     }
     if (FL_TEST(str, STR_ASSOC)) {
 	rb_str_modify(str);
-	REALLOC_N(RSTRING(str)->ptr, char, RSTRING(str)->len+len);
+	REALLOC_N(RSTRING(str)->ptr, char, RSTRING(str)->len+len+1);
 	memcpy(RSTRING(str)->ptr + RSTRING(str)->len, ptr, len);
 	RSTRING(str)->len += len;
 	RSTRING(str)->ptr[RSTRING(str)->len] = '\0'; /* sentinel */

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