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

  New Revision: 16399

  Modified files:
    trunk/ChangeLog
    trunk/string.c
    trunk/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/trunk/version.h?r1=16399&r2=16398&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=16399&r2=16398&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16399&r2=16398&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16398)
+++ ChangeLog	(revision 16399)
@@ -4,6 +4,11 @@
 	  (rb_f_readline): ditto.
 	  (rb_f_readlines): ditto.
 
+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 23:37:57 2008  Yusuke Endoh  <mame@t...>
 
 	* vm.c (collect_local_variables_in_env): remove unnecessary check
Index: string.c
===================================================================
--- string.c	(revision 16398)
+++ string.c	(revision 16399)
@@ -1448,7 +1448,7 @@
     if (STR_ASSOC_P(str)) {
 	rb_str_modify(str);
 	if (STR_EMBED_P(str)) str_make_independent(str);
-	REALLOC_N(RSTRING(str)->as.heap.ptr, char, RSTRING(str)->as.heap.len+len);
+	REALLOC_N(RSTRING(str)->as.heap.ptr, char, RSTRING(str)->as.heap.len+len+1);
 	memcpy(RSTRING(str)->as.heap.ptr + RSTRING(str)->as.heap.len, ptr, len);
 	RSTRING(str)->as.heap.len += len;
 	RSTRING(str)->as.heap.ptr[RSTRING(str)->as.heap.len] = '\0'; /* sentinel */
Index: version.h
===================================================================
--- version.h	(revision 16398)
+++ version.h	(revision 16399)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-05-12"
+#define RUBY_RELEASE_DATE "2008-05-13"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080512
+#define RUBY_RELEASE_CODE 20080513
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #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[];

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