From c77efe114476e3fd5a1d66cba12ad65c7a1bf40e Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 10 Dec 2014 07:48:48 +0000 Subject: string.c: term fill * string.c (rb_str_chomp_bang): fill wchar terminator. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 2 +- test/-ext-/string/test_cstr.rb | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/string.c b/string.c index bb50e5a902..a0e413a267 100644 --- a/string.c +++ b/string.c @@ -7188,7 +7188,7 @@ rb_str_chomp_bang(int argc, VALUE *argv, VALUE str) len = chompped_length(str, rs); if (len < olen) { STR_SET_LEN(str, len); - RSTRING_PTR(str)[len] = '\0'; + TERM_FILL(&RSTRING_PTR(str)[len], TERM_LEN(str)); if (ENC_CODERANGE(str) != ENC_CODERANGE_7BIT) { ENC_CODERANGE_CLEAR(str); } diff --git a/test/-ext-/string/test_cstr.rb b/test/-ext-/string/test_cstr.rb index e5979ec60b..a1288373ba 100644 --- a/test/-ext-/string/test_cstr.rb +++ b/test/-ext-/string/test_cstr.rb @@ -48,6 +48,10 @@ class Test_StringCStr < Test::Unit::TestCase assert_wchars_term_char("a ") {|s| s.rstrip!} end + def test_wchar_chop! + assert_wchars_term_char("a\n") {|s| s.chop!} + end + def assert_wchars_term_char(str) result = {} WCHARS.map do |enc| -- cgit v1.2.3