diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 2 | ||||
-rw-r--r-- | test/ruby/test_string.rb | 6 |
3 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Sun Sep 30 21:18:03 2012 NARUSE, Yui <naruse@ruby-lang.org> + + * string.c (rb_str_concat): use memcpy to copy a string which contains + NUL characters. [ruby-core:47751] [Bug #7090] + Sat Sep 29 19:41:53 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com> * test/ruby/envutil.rb (EnvUtil#invoke_ruby): kill child process @@ -2158,7 +2158,7 @@ rb_str_concat(VALUE str1, VALUE str2) rb_raise(rb_eRangeError, "invalid codepoint 0x%X in %s", code, rb_enc_name(enc)); } rb_str_resize(str1, pos+len); - strncpy(RSTRING_PTR(str1) + pos, buf, len); + memcpy(RSTRING_PTR(str1) + pos, buf, len); if (cr == ENC_CODERANGE_7BIT && code > 127) cr = ENC_CODERANGE_VALID; ENC_CODERANGE_SET(str1, cr); diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index bb0d9b04f9..d5778ab747 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -473,6 +473,12 @@ class TestString < Test::Unit::TestCase def test_concat assert_equal(S("world!"), S("world").concat(33)) assert_equal(S("world!"), S("world").concat(S('!'))) + + bug7090 = '[ruby-core:47751]' + result = S("").force_encoding(Encoding::UTF_16LE) + result << 0x0300 + expected = S("\u0300".encode(Encoding::UTF_16LE)) + assert_equal(expected, result, bug7090) end def test_count |