akr	2008-01-09 17:00:26 +0900 (Wed, 09 Jan 2008)

  New Revision: 14966

  Modified files:
    trunk/ChangeLog
    trunk/string.c

  Log:
    * string.c (rb_enc_cr_str_buf_cat): fix self appending.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=14966&r2=14965&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14966&r2=14965&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14965)
+++ ChangeLog	(revision 14966)
@@ -1,3 +1,7 @@
+Wed Jan  9 16:59:54 2008  Tanaka Akira  <akr@f...>
+
+	* string.c (rb_enc_cr_str_buf_cat): fix self appending.
+
 Wed Jan  9 15:54:24 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (process_options): give priority command line encoding option
Index: string.c
===================================================================
--- string.c	(revision 14965)
+++ string.c	(revision 14966)
@@ -1132,9 +1132,6 @@
         off = ptr - RSTRING_PTR(str);
     }
     rb_str_modify(str);
-    if (off != -1) {
-        ptr = RSTRING_PTR(str) + off;
-    }
     if (len == 0) {
         ENCODING_CODERANGE_SET(str, res_encindex, res_cr);
         return str;
@@ -1156,6 +1153,9 @@
 	}
 	RESIZE_CAPA(str, capa);
     }
+    if (off != -1) {
+        ptr = RSTRING_PTR(str) + off;
+    }
     memcpy(RSTRING_PTR(str) + RSTRING_LEN(str), ptr, len);
     STR_SET_LEN(str, total);
     RSTRING_PTR(str)[total] = '\0'; // sentinel

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