usa	2014-09-03 12:52:57 +0900 (Wed, 03 Sep 2014)

  New Revision: 47366

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

  Log:
    merge revision(s) 45676,45677: [Backport #9769]
    
    stringio.c: move GC guard
    
    * ext/stringio/stringio.c (strio_write): move GC guard after the
      last using position.
    * ext/stringio/stringio.c (strio_write): use rb_str_append to
      reuse coderange bits other than ASCII-8BIT, and keep
      taintedness.  [ruby-dev:48118] [Bug #9769]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/ext/stringio/stringio.c
    branches/ruby_2_0_0/test/stringio/test_stringio.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 47365)
+++ ruby_2_0_0/ChangeLog	(revision 47366)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Sep  3 12:48:14 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/stringio/stringio.c (strio_write): use rb_str_append to
+	  reuse coderange bits other than ASCII-8BIT, and keep
+	  taintedness.  [ruby-dev:48118] [Bug #9769]
+
 Wed Sep  3 12:41:35 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* hash.c (env_shift): fix memory leak on Windows, free environment
Index: ruby_2_0_0/ext/stringio/stringio.c
===================================================================
--- ruby_2_0_0/ext/stringio/stringio.c	(revision 47365)
+++ ruby_2_0_0/ext/stringio/stringio.c	(revision 47366)
@@ -1172,7 +1172,6 @@ strio_write(VALUE self, VALUE str) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/stringio/stringio.c#L1172
     long len, olen;
     rb_encoding *enc, *enc2;
 
-    RB_GC_GUARD(str);
     if (!RB_TYPE_P(str, T_STRING))
 	str = rb_obj_as_string(str);
     enc = rb_enc_get(ptr->string);
@@ -1188,7 +1187,13 @@ strio_write(VALUE self, VALUE str) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/stringio/stringio.c#L1187
 	ptr->pos = olen;
     }
     if (ptr->pos == olen) {
-	rb_str_cat(ptr->string, RSTRING_PTR(str), len);
+	if (enc2 == rb_ascii8bit_encoding()) {
+	    rb_enc_str_buf_cat(ptr->string, RSTRING_PTR(str), len, enc);
+	    OBJ_INFECT(ptr->string, str);
+	}
+	else {
+	    rb_str_buf_append(ptr->string, str);
+	}
     }
     else {
 	strio_extend(ptr, ptr->pos, len);
@@ -1196,6 +1201,7 @@ strio_write(VALUE self, VALUE str) https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ext/stringio/stringio.c#L1201
 	OBJ_INFECT(ptr->string, str);
     }
     OBJ_INFECT(ptr->string, self);
+    RB_GC_GUARD(str);
     ptr->pos += len;
     return LONG2NUM(len);
 }
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 47365)
+++ ruby_2_0_0/version.h	(revision 47366)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2014-09-03"
-#define RUBY_PATCHLEVEL 544
+#define RUBY_PATCHLEVEL 545
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 9
Index: ruby_2_0_0/test/stringio/test_stringio.rb
===================================================================
--- ruby_2_0_0/test/stringio/test_stringio.rb	(revision 47365)
+++ ruby_2_0_0/test/stringio/test_stringio.rb	(revision 47366)
@@ -111,6 +111,24 @@ class TestStringIO < Test::Unit::TestCas https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/stringio/test_stringio.rb#L111
     f.close unless f.closed?
   end
 
+  def test_write_infection
+    bug9769 = '[ruby-dev:48118] [Bug #9769]'
+    s = "".untaint
+    f = StringIO.new(s, "w")
+    f.print("bar".taint)
+    f.close
+    assert_predicate(s, :tainted?, bug9769)
+  ensure
+    f.close unless f.closed?
+  end
+
+  def test_write_encoding
+    s = "".force_encoding(Encoding::UTF_8)
+    f = StringIO.new(s)
+    f.print("\u{3053 3093 306b 3061 306f ff01}".b)
+    assert_equal(Encoding::UTF_8, s.encoding, "honor the original encoding over ASCII-8BIT")
+  end
+
   def test_mode_error
     f = StringIO.new("", "r")
     assert_raise(IOError) { f.write("foo") }

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45676-45677


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