nobu	2008-06-22 07:16:45 +0900 (Sun, 22 Jun 2008)

  New Revision: 17530

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

  Log:
    * string.c (str_buf_cat): check for self concatenation.


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

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 17529)
+++ ruby_1_8/ChangeLog	(revision 17530)
@@ -1,3 +1,7 @@
+Sun Jun 22 07:16:42 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (str_buf_cat): check for self concatenation.
+
 Sat Jun 21 15:57:15 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc#collect_first_comment): skip
Index: ruby_1_8/string.c
===================================================================
--- ruby_1_8/string.c	(revision 17529)
+++ ruby_1_8/string.c	(revision 17530)
@@ -708,9 +708,13 @@
     const char *ptr;
     long len;
 {
-    long capa, total;
+    long capa, total, off = -1;;
 
     rb_str_modify(str);
+    if (ptr >= RSTRING(str)->ptr && ptr <= RSTRING(str)->ptr + RSTRING(str)->len) {
+        off = ptr - RSTRING(str)->ptr;
+    }
+    if (len == 0) return 0;
     if (FL_TEST(str, STR_ASSOC)) {
 	FL_UNSET(str, STR_ASSOC);
 	capa = RSTRING(str)->aux.capa = RSTRING(str)->len;
@@ -732,6 +736,9 @@
 	}
 	RESIZE_CAPA(str, capa);
     }
+    if (off != -1) {
+        ptr = RSTRING(str)->ptr + off;
+    }
     memcpy(RSTRING(str)->ptr + RSTRING(str)->len, ptr, len);
     RSTRING(str)->len = total;
     RSTRING(str)->ptr[total] = '\0'; /* sentinel */

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