nobu	2015-04-25 14:26:22 +0900 (Sat, 25 Apr 2015)

  New Revision: 50386

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

  Log:
    revert r50336
    
    * string.c (str_buf_cat): expand later so that the buffer can be
      larger for further use.  [Bug #11080] [Bug #11080]

  Modified files:
    trunk/ChangeLog
    trunk/string.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50385)
+++ ChangeLog	(revision 50386)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Apr 25 14:26:19 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* string.c (str_buf_cat): expand later so that the buffer can be
+	  larger for further use.  [Bug #11080] [Bug #11080]
+
 Fri Apr 24 23:48:45 2015  Akinori MUSHA  <knu@i...>
 
 	* misc/ruby-electric.el: Import version 2.2.3 from
Index: string.c
===================================================================
--- string.c	(revision 50385)
+++ string.c	(revision 50386)
@@ -2194,7 +2194,7 @@ str_buf_cat(VALUE str, const char *ptr, https://github.com/ruby/ruby/blob/trunk/string.c#L2194
     if (ptr >= sptr && ptr <= sptr + olen) {
         off = ptr - sptr;
     }
-    rb_str_modify_expand(str, len);
+    rb_str_modify(str);
     if (len == 0) return 0;
     if (STR_EMBED_P(str)) {
 	capa = RSTRING_EMBED_LEN_MAX;

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