usa	2016-08-16 20:39:21 +0900 (Tue, 16 Aug 2016)

  New Revision: 55936

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

  Log:
    merge revision(s) 55181: [Backport #12431]
    
    * transcode.c (str_transcode0): scrub in the given encoding when
      the source encoding is given, not in the encoding of the
      receiver.  [ruby-core:75732] [Bug #12431]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/internal.h
    branches/ruby_2_2/string.c
    branches/ruby_2_2/test/ruby/test_transcode.rb
    branches/ruby_2_2/transcode.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 55935)
+++ ruby_2_2/ChangeLog	(revision 55936)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Aug 16 20:34:22 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* transcode.c (str_transcode0): scrub in the given encoding when
+	  the source encoding is given, not in the encoding of the
+	  receiver.  [ruby-core:75732] [Bug #12431]
+
 Tue Aug 16 20:30:53 2016  Kazuki Yamaguchi  <k@r...>
 
 	* ext/openssl/ossl_pkey_dh.c (ossl_dh_compute_key): Check that the DH
Index: ruby_2_2/string.c
===================================================================
--- ruby_2_2/string.c	(revision 55935)
+++ ruby_2_2/string.c	(revision 55936)
@@ -8255,8 +8255,13 @@ str_compat_and_valid(VALUE str, rb_encod https://github.com/ruby/ruby/blob/trunk/ruby_2_2/string.c#L8255
 VALUE
 rb_str_scrub(VALUE str, VALUE repl)
 {
+    return rb_enc_str_scrub(STR_ENC_GET(str), str, repl);
+}
+
+VALUE
+rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl)
+{
     int cr = ENC_CODERANGE(str);
-    rb_encoding *enc;
     int encidx;
     VALUE buf = Qnil;
     const char *rep;
@@ -8266,7 +8271,6 @@ rb_str_scrub(VALUE str, VALUE repl) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/string.c#L8271
     if (cr == ENC_CODERANGE_7BIT || cr == ENC_CODERANGE_VALID)
 	return Qnil;
 
-    enc = STR_ENC_GET(str);
     if (!NIL_P(repl)) {
 	repl = str_compat_and_valid(repl, enc);
 	tainted = OBJ_TAINTED_RAW(repl);
Index: ruby_2_2/test/ruby/test_transcode.rb
===================================================================
--- ruby_2_2/test/ruby/test_transcode.rb	(revision 55935)
+++ ruby_2_2/test/ruby/test_transcode.rb	(revision 55936)
@@ -1212,6 +1212,9 @@ class TestTranscode < Test::Unit::TestCa https://github.com/ruby/ruby/blob/trunk/ruby_2_2/test/ruby/test_transcode.rb#L1212
   def test_invalid_replace_string
     assert_equal("a<x>A", "a\x80A".encode("us-ascii", "euc-jp", :invalid=>:replace, :replace=>"<x>"))
     assert_equal("a<x>A", "a\x80A".encode("us-ascii", "euc-jis-2004", :invalid=>:replace, :replace=>"<x>"))
+    s = "abcd\u{c1}"
+    r = s.b.encode("UTF-8", "UTF-8", invalid: :replace, replace: "\u{fffd}")
+    assert_equal(s, r)
   end
 
   def test_undef_replace
Index: ruby_2_2/internal.h
===================================================================
--- ruby_2_2/internal.h	(revision 55935)
+++ ruby_2_2/internal.h	(revision 55936)
@@ -990,6 +990,7 @@ void rb_str_fill_terminator(VALUE str, c https://github.com/ruby/ruby/blob/trunk/ruby_2_2/internal.h#L990
 VALUE rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg);
 #ifdef RUBY_ENCODING_H
 VALUE rb_external_str_with_enc(VALUE str, rb_encoding *eenc);
+VALUE rb_enc_str_scrub(rb_encoding *enc, VALUE str, VALUE repl);
 #endif
 #define STR_NOEMBED      FL_USER1
 #define STR_SHARED       FL_USER2 /* = ELTS_SHARED */
Index: ruby_2_2/transcode.c
===================================================================
--- ruby_2_2/transcode.c	(revision 55935)
+++ ruby_2_2/transcode.c	(revision 55936)
@@ -2700,7 +2700,7 @@ str_transcode0(int argc, VALUE *argv, VA https://github.com/ruby/ruby/blob/trunk/ruby_2_2/transcode.c#L2700
 		if (!NIL_P(ecopts)) {
 		    rep = rb_hash_aref(ecopts, sym_replace);
 		}
-		dest = rb_str_scrub(str, rep);
+		dest = rb_enc_str_scrub(senc, str, rep);
 		if (NIL_P(dest)) dest = str;
 		*self = dest;
 		return dencidx;
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 55935)
+++ ruby_2_2/version.h	(revision 55936)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.6"
 #define RUBY_RELEASE_DATE "2016-08-16"
-#define RUBY_PATCHLEVEL 362
+#define RUBY_PATCHLEVEL 363
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 8

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r55181


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