1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preserve the string content at self-copying

Browse Source 
* string.c (rb_str_init): preserve the embedded content when
  self-copying with a capacity.  [Bug #15937]
This commit is contained in:
Nobuyoshi Nakada 2019-06-19 09:44:26 +09:00
parent d009e321a0
commit 28678997e4
No known key found for this signature in database
GPG Key ID: 4BC7D6DF58D8DF60
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
string.c
View File

@ -1331,6 +1331,7 @@ str_new_empty(VALUE str)
} }
#define STR_BUF_MIN_SIZE 127 #define STR_BUF_MIN_SIZE 127
STATIC_ASSERT(STR_BUF_MIN_SIZE, STR_BUF_MIN_SIZE > RSTRING_EMBED_LEN_MAX);
VALUE VALUE
rb_str_buf_new(long capa) rb_str_buf_new(long capa)
@ -1611,7 +1612,9 @@ rb_str_init(int argc, VALUE *argv, VALUE str)
} }
str_modifiable(str); str_modifiable(str);
if (STR_EMBED_P(str)) { /* make noembed always */ if (STR_EMBED_P(str)) { /* make noembed always */
RSTRING(str)->as.heap.ptr = ALLOC_N(char, (size_t)capa + termlen); char *new_ptr = ALLOC_N(char, (size_t)capa + termlen);
memcpy(new_ptr, RSTRING(str)->as.ary, RSTRING_EMBED_LEN_MAX + 1);
RSTRING(str)->as.heap.ptr = new_ptr;
} }
else if (STR_HEAP_SIZE(str) != (size_t)capa + termlen) { else if (STR_HEAP_SIZE(str) != (size_t)capa + termlen) {
SIZED_REALLOC_N(RSTRING(str)->as.heap.ptr, char, SIZED_REALLOC_N(RSTRING(str)->as.heap.ptr, char,

9
test/ruby/test_string.rb
View File

@ -68,6 +68,15 @@ class TestString < Test::Unit::TestCase
assert_raise(FrozenError){ str.__send__(:initialize, encoding: 'euc-jp') } assert_raise(FrozenError){ str.__send__(:initialize, encoding: 'euc-jp') }
assert_raise(FrozenError){ str.__send__(:initialize, 'abc', encoding: 'euc-jp') } assert_raise(FrozenError){ str.__send__(:initialize, 'abc', encoding: 'euc-jp') }
assert_raise(FrozenError){ str.__send__(:initialize, 'abc', capacity: 1000, encoding: 'euc-jp') } assert_raise(FrozenError){ str.__send__(:initialize, 'abc', capacity: 1000, encoding: 'euc-jp') }
str = S("")
assert_equal("mystring", str.__send__(:initialize, "mystring"))
str = S("mystring")
assert_equal("mystring", str.__send__(:initialize, str))
str = S("")
assert_equal("mystring", str.__send__(:initialize, "mystring", capacity: 1000))
str = S("mystring")
assert_equal("mystring", str.__send__(:initialize, str, capacity: 1000))
end end
def test_initialize_nonstring def test_initialize_nonstring