From 117438ee7bb5fc99423cec201f804da540e340b8 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 10 Dec 2014 12:09:49 +0000 Subject: string.c: term fill * string.c (rb_str_sub_bang): fill wchar terminator. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48763 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 49e3c18152..2fb67efe92 100644 --- a/string.c +++ b/string.c @@ -4158,7 +4158,7 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str) memcpy(p + beg0, rp, rlen); len += rlen - plen; STR_SET_LEN(str, len); - RSTRING_PTR(str)[len] = '\0'; + TERM_FILL(&RSTRING_PTR(str)[len], TERM_LEN(str)); ENC_CODERANGE_SET(str, cr); if (tainted) OBJ_TAINT(str); diff --git a/test/-ext-/string/test_cstr.rb b/test/-ext-/string/test_cstr.rb index a7cb0ebe9c..4535921836 100644 --- a/test/-ext-/string/test_cstr.rb +++ b/test/-ext-/string/test_cstr.rb @@ -60,6 +60,10 @@ class Test_StringCStr < Test::Unit::TestCase assert_wchars_term_char("a"*30) {|s| s[29,1] = ""} end + def test_wchar_sub! + assert_wchars_term_char("foobar") {|s| s.sub!(/#{"foo".encode(s.encoding)}/, "")} + end + def assert_wchars_term_char(str) result = {} WCHARS.map do |enc| -- cgit v1.2.3