nobu	2012-02-14 16:00:33 +0900 (Tue, 14 Feb 2012)

  New Revision: 34592

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

  Log:
    * io.c (io_setstrbuf): cut down the buffer if longer.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34591)
+++ ChangeLog	(revision 34592)
@@ -1,3 +1,7 @@
+Tue Feb 14 16:00:30 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (io_setstrbuf): cut down the buffer if longer.
+
 Tue Feb 14 15:06:37 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* lib/test/unit/assertions.rb (build_message): skip escaped
Index: io.c
===================================================================
--- io.c	(revision 34591)
+++ io.c	(revision 34592)
@@ -2072,7 +2072,7 @@
 }
 
 static void
-io_setstrbuf(VALUE *str,long len)
+io_setstrbuf(VALUE *str, long len)
 {
 #ifdef _WIN32
     len = (len + 1) & ~1L;	/* round up for wide char */
@@ -2081,8 +2081,13 @@
 	*str = rb_str_new(0, 0);
     }
     else {
-	StringValue(*str);
-	len -= RSTRING_LEN(*str);
+	VALUE s = StringValue(*str);
+	long clen = RSTRING_LEN(s);
+	if (clen >= len) {
+	    if (clen != len) rb_str_set_len(s, len);
+	    return;
+	}
+	len -= clen;
     }
     rb_str_modify_expand(*str, len);
 }

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