ruby-changes:36681
From: nobu <ko1@a...>
Date: Wed, 10 Dec 2014 16:49:24 +0900 (JST)
Subject: [ruby-changes:36681] nobu:r48762 (trunk): string.c: term fill
nobu 2014-12-10 16:49:10 +0900 (Wed, 10 Dec 2014) New Revision: 48762 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48762 Log: string.c: term fill * string.c (rb_str_splice_0): fill wchar terminator. Modified files: trunk/string.c trunk/test/-ext-/string/test_cstr.rb Index: string.c =================================================================== --- string.c (revision 48761) +++ string.c (revision 48762) @@ -3709,7 +3709,7 @@ rb_str_splice_0(VALUE str, long beg, lon https://github.com/ruby/ruby/blob/trunk/string.c#L3709 RSTRING_GETMEM(str, sptr, slen); if (len < vlen) { /* expand string */ - RESIZE_CAPA(str, slen + vlen - len + TERM_LEN(str)); + RESIZE_CAPA(str, slen + vlen - len); sptr = RSTRING_PTR(str); } @@ -3726,7 +3726,7 @@ rb_str_splice_0(VALUE str, long beg, lon https://github.com/ruby/ruby/blob/trunk/string.c#L3726 } slen += vlen - len; STR_SET_LEN(str, slen); - sptr[slen] = '\0'; + TERM_FILL(&sptr[slen], TERM_LEN(str)); OBJ_INFECT(str, val); } Index: test/-ext-/string/test_cstr.rb =================================================================== --- test/-ext-/string/test_cstr.rb (revision 48761) +++ test/-ext-/string/test_cstr.rb (revision 48762) @@ -56,6 +56,10 @@ class Test_StringCStr < Test::Unit::Test https://github.com/ruby/ruby/blob/trunk/test/-ext-/string/test_cstr.rb#L56 assert_wchars_term_char("a\n") {|s| s.chomp!} end + def test_wchar_aset + assert_wchars_term_char("a"*30) {|s| s[29,1] = ""} + end + def assert_wchars_term_char(str) result = {} WCHARS.map do |enc| -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/