diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-10 07:48:56 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-12-10 07:48:56 +0000 |
| commit | ed94c24944b0014cc89a3b56f76881ccbfa61a1d (patch) | |
| tree | a71eaaef1add6c94973552eb79c0f7bfc05fa79a | |
| parent | c77efe114476e3fd5a1d66cba12ad65c7a1bf40e (diff) | |
| download | ruby-ed94c24944b0014cc89a3b56f76881ccbfa61a1d.tar.gz | |
string.c: term fill
* string.c (rb_str_chop_bang): fill wchar terminator.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | string.c | 2 | ||||
| -rw-r--r-- | test/-ext-/string/test_cstr.rb | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -7024,7 +7024,7 @@ rb_str_chop_bang(VALUE str) long len; len = chopped_length(str); 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 a1288373ba..89ab3bb7b0 100644 --- a/test/-ext-/string/test_cstr.rb +++ b/test/-ext-/string/test_cstr.rb @@ -52,6 +52,10 @@ class Test_StringCStr < Test::Unit::TestCase assert_wchars_term_char("a\n") {|s| s.chop!} end + def test_wchar_chomp! + assert_wchars_term_char("a\n") {|s| s.chomp!} + end + def assert_wchars_term_char(str) result = {} WCHARS.map do |enc| |