diff options
| -rw-r--r-- | string.c | 4 | ||||
| -rw-r--r-- | test/-ext-/string/test_cstr.rb | 14 |
2 files changed, 16 insertions, 2 deletions
@@ -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| |