ruby-changes:67664
From: Peter <ko1@a...>
Date: Wed, 8 Sep 2021 23:20:36 +0900 (JST)
Subject: [ruby-changes:67664] 5d81554281 (master): [Bug #18154] Fix memory leak in String#initialize
https://git.ruby-lang.org/ruby.git/commit/?id=5d81554281 From 5d815542815fe8b939239750bba7f8f0b79c97d6 Mon Sep 17 00:00:00 2001 From: Peter Zhu <peter@p...> Date: Tue, 7 Sep 2021 14:06:42 -0400 Subject: [Bug #18154] Fix memory leak in String#initialize 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. --- string.c | 2 +- test/ruby/test_string.rb | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/string.c b/string.c index 9727182..72de7d2 100644 --- a/string.c +++ b/string.c @@ -1734,7 +1734,7 @@ rb_str_init(int argc, VALUE *argv, VALUE str) https://github.com/ruby/ruby/blob/trunk/string.c#L1734 const size_t osize = RSTRING(str)->as.heap.len + TERM_LEN(str); char *new_ptr = ALLOC_N(char, (size_t)capa + termlen); 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; } else if (STR_HEAP_SIZE(str) != (size_t)capa + termlen) { diff --git a/test/ruby/test_string.rb b/test/ruby/test_string.rb index e1a957e..12e4b0f 100644 --- a/test/ruby/test_string.rb +++ b/test/ruby/test_string.rb @@ -105,6 +105,16 @@ PREP https://github.com/ruby/ruby/blob/trunk/test/ruby/test_string.rb#L105 CODE 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 # '[]' assert_equal("A", S("AooBar")[0]) assert_equal("B", S("FooBaB")[-1]) -- cgit v1.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/