aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-10 07:48:48 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-10 07:48:48 +0000
commitc77efe114476e3fd5a1d66cba12ad65c7a1bf40e (patch)
tree33a9ad073cf0b10b580dbfef35d55406fe6e1f29
parent0c50d7ba1511cb89e7dd51e6f270725f07012a5b (diff)
downloadruby-c77efe114476e3fd5a1d66cba12ad65c7a1bf40e.tar.gz
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
-rw-r--r--string.c2
-rw-r--r--test/-ext-/string/test_cstr.rb4
2 files changed, 5 insertions, 1 deletions
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|