From 88ae402cbf008f96db10d1acb39b6078fb1f8de2 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 12 Dec 2014 01:20:41 +0000
Subject: [PATCH] string.c: term fill

* string.c (tr_trans): fill wchar terminator.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 string.c                       |  4 ++--
 test/-ext-/string/test_cstr.rb | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/string.c b/string.c
index 6b3b61c9e9..36fe859aa1 100644
--- a/string.c
+++ b/string.c
@@ -5671,7 +5671,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
 	if (!STR_EMBED_P(str)) {
 	    ruby_sized_xfree(STR_HEAP_PTR(str), STR_HEAP_SIZE(str));
 	}
-	*t = '\0';
+	TERM_FILL(t, rb_enc_mbminlen(enc));
 	RSTRING(str)->as.heap.ptr = buf;
 	RSTRING(str)->as.heap.len = t - buf;
 	STR_SET_NOEMBED(str);
@@ -5747,7 +5747,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
 	if (!STR_EMBED_P(str)) {
 	    ruby_sized_xfree(STR_HEAP_PTR(str), STR_HEAP_SIZE(str));
 	}
-	*t = '\0';
+	TERM_FILL(t, rb_enc_mbminlen(enc));
 	RSTRING(str)->as.heap.ptr = buf;
 	RSTRING(str)->as.heap.len = t - buf;
 	STR_SET_NOEMBED(str);
diff --git a/test/-ext-/string/test_cstr.rb b/test/-ext-/string/test_cstr.rb
index 9c2b73f695..6f2fdef3d4 100644
--- a/test/-ext-/string/test_cstr.rb
+++ b/test/-ext-/string/test_cstr.rb
@@ -72,6 +72,20 @@ class Test_StringCStr < Test::Unit::TestCase
     assert_wchars_term_char("foo!") {|s| s.squeeze!}
   end
 
+  def test_wchar_tr!
+    assert_wchars_term_char("\u{3042}foobar") {|s|
+      enc = s.encoding
+      s.tr!("\u{3042}".encode(enc), "c".encode(enc))
+    }
+  end
+
+  def test_wchar_tr_s!
+    assert_wchars_term_char("\u{3042}foobar") {|s|
+      enc = s.encoding
+      s.tr_s!("\u{3042}".encode(enc), "c".encode(enc))
+    }
+  end
+
   def assert_wchars_term_char(str)
     result = {}
     WCHARS.map do |enc|