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

[Bug #18154] Fix memory leak in String#initialize

Browse source 
String#initialize can leak memory when called on a string that is marked
with STR_NOFREE because it does not unset the STR_NOFREE flag.
This commit is contained in:
Peter Zhu 2021-09-07 14:06:42 -04:00
parent 0b9242ffac
commit 5d81554281
Notes: git 2021-09-08 23:20:38 +09:00 
Merged: https://github.com/ruby/ruby/pull/4814
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
string.c
View file

@ -1734,7 +1734,7 @@ rb_str_init(int argc, VALUE *argv, VALUE str)
const size_t osize = RSTRING(str)->as.heap.len + TERM_LEN(str); const size_t osize = RSTRING(str)->as.heap.len + TERM_LEN(str);
char *new_ptr = ALLOC_N(char, (size_t)capa + termlen); char *new_ptr = ALLOC_N(char, (size_t)capa + termlen);
memcpy(new_ptr, old_ptr, osize < size ? osize : size); memcpy(new_ptr, old_ptr, osize < size ? osize : size);
FL_UNSET_RAW(str, STR_SHARED); FL_UNSET_RAW(str, STR_SHARED|STR_NOFREE);
RSTRING(str)->as.heap.ptr = new_ptr; 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) {

10
test/ruby/test_string.rb
View file

@ -105,6 +105,16 @@ PREP
CODE CODE
end end
# Bug #18154
def test_initialize_nofree_memory_leak
assert_no_memory_leak([], <<-PREP, <<-CODE, rss: true)
code = proc {0.to_s.__send__(:initialize, capacity: 10000)}
1_000.times(&code)
PREP
100_000.times(&code)
CODE
end
def test_AREF # '[]' def test_AREF # '[]'
assert_equal("A", S("AooBar")[0]) assert_equal("A", S("AooBar")[0])
assert_equal("B", S("FooBaB")[-1]) assert_equal("B", S("FooBaB")[-1])