1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

string.c: term fill

Browse Source 
* string.c (rb_str_squeeze_bang): fill wchar terminator.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-12-11 00:37:58 +00:00
parent 0eebb8f1c0
commit 5c100b57f8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
string.c
View File

@ -6076,7 +6076,7 @@ rb_str_squeeze_bang(int argc, VALUE *argv, VALUE str)
} }
} }
*t = '\0'; TERM_FILL(t, TERM_LEN(str));
if (t - RSTRING_PTR(str) != RSTRING_LEN(str)) { if (t - RSTRING_PTR(str) != RSTRING_LEN(str)) {
STR_SET_LEN(str, t - RSTRING_PTR(str)); STR_SET_LEN(str, t - RSTRING_PTR(str));
modify = 1; modify = 1;

4
test/-ext-/string/test_cstr.rb
View File

@ -68,6 +68,10 @@ class Test_StringCStr < Test::Unit::TestCase
assert_wchars_term_char("foobar") {|s| s.delete!("ao".encode(s.encoding))} assert_wchars_term_char("foobar") {|s| s.delete!("ao".encode(s.encoding))}
end end
def test_wchar_squeeze!
assert_wchars_term_char("foo!") {|s| s.squeeze!}
end
def assert_wchars_term_char(str) def assert_wchars_term_char(str)
result = {} result = {}
WCHARS.map do |enc| WCHARS.map do |enc|