kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* string.c (rb_str_concat): use memcpy to copy a string which contains

Browse source 
NUL characters. [ruby-core:47751] [Bug #7090]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37058 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-09-30 12:20:09 +00:00
parent 4d4800a5a7
commit 64989fa5a2
3 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Sat Sep 29 19:41:53 2012 Hiroshi Shirosaki <h.shirosaki@gmail.com>
* test/ruby/envutil.rb (EnvUtil#invoke_ruby): kill child process * test/ruby/envutil.rb (EnvUtil#invoke_ruby): kill child process

2
string.c
View file

@ -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_raise(rb_eRangeError, "invalid codepoint 0x%X in %s", code, rb_enc_name(enc));
} }
rb_str_resize(str1, pos+len); 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) if (cr == ENC_CODERANGE_7BIT && code > 127)
cr = ENC_CODERANGE_VALID; cr = ENC_CODERANGE_VALID;
ENC_CODERANGE_SET(str1, cr); ENC_CODERANGE_SET(str1, cr);

6
test/ruby/test_string.rb
View file

@ -473,6 +473,12 @@ class TestString < Test::Unit::TestCase
def test_concat def test_concat
assert_equal(S("world!"), S("world").concat(33)) assert_equal(S("world!"), S("world").concat(33))
assert_equal(S("world!"), S("world").concat(S('!'))) 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 end
def test_count def test_count