From 64989fa5a2a8022aee8e6a5b71eb1e77eba5ce82 Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 30 Sep 2012 12:20:09 +0000 Subject: * string.c (rb_str_concat): use memcpy to copy a string which contains NUL characters. [ruby-core:47751] [Bug #7090] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ string.c | 2 +- test/ruby/test_string.rb | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9ed36889c9..9e322c66fd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Sep 30 21:18:03 2012 NARUSE, Yui + + * 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 * test/ruby/envutil.rb (EnvUtil#invoke_ruby): kill child process diff --git a/string.c b/string.c index 26463b95e2..71a06abacc 100644 --- a/string.c +++ b/string.c @@ -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 -- cgit v1.2.3