shyouhei	2008-06-30 20:35:08 +0900 (Mon, 30 Jun 2008)

  New Revision: 17733

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

  Log:
    merge revision(s) 17530:
    * string.c (str_buf_cat): check for self concatenation.



  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=17733

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

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 17732)
+++ ruby_1_8_6/ChangeLog	(revision 17733)
@@ -1,3 +1,7 @@
+Mon Jun 30 20:34:05 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (str_buf_cat): check for self concatenation.
+
 Sun Jun 29 21:38:52 2008  Tanaka Akira  <akr@f...>
 
 	* eval.c (rb_obj_respond_to): use RTEST to test the result of
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 17732)
+++ ruby_1_8_6/version.h	(revision 17733)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-06-29"
+#define RUBY_RELEASE_DATE "2008-06-30"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080629
-#define RUBY_PATCHLEVEL 255
+#define RUBY_RELEASE_CODE 20080630
+#define RUBY_PATCHLEVEL 256
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 30
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8_6/string.c
===================================================================
--- ruby_1_8_6/string.c	(revision 17732)
+++ ruby_1_8_6/string.c	(revision 17733)
@@ -693,9 +693,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;
@@ -717,6 +721,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/