summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2023-03-21 15:22:57 +0900
committernagachika <nagachika@ruby-lang.org>2023-03-21 15:22:57 +0900
commit0d00732d39de1e5ecce738260a1e49d8af52e12a (patch)
tree332b73983912e1804eec2a1ed28bc16c803c2c79
parent82d763c94ad693a2af8086df8e0455b7de2d2ce3 (diff)
merge revision(s) c6f84e918943a0bf8db6fee556fc53180d257510: [Backport #19398]
[Bug #19398] Memory leak in WeakMap There's a memory leak in ObjectSpace::WeakMap due to not freeing the `struct weakmap`. It can be seen in the following script: ``` 100.times do 10000.times do ObjectSpace::WeakMap.new end # Output the Resident Set Size (memory usage, in KB) of the current Ruby process puts `ps -o rss= -p #{$$}` end ``` --- gc.c | 1 + test/ruby/test_weakmap.rb | 9 +++++++++ 2 files changed, 10 insertions(+)
-rw-r--r--gc.c1
-rw-r--r--test/ruby/test_weakmap.rb9
-rw-r--r--version.h2
3 files changed, 11 insertions, 1 deletions
diff --git a/gc.c b/gc.c
index cb33eb511b..a9d7352f2f 100644
--- a/gc.c
+++ b/gc.c
@@ -11987,6 +11987,7 @@ wmap_free(void *ptr)
st_foreach(w->obj2wmap, wmap_free_map, 0);
st_free_table(w->obj2wmap);
st_free_table(w->wmap2obj);
+ xfree(w);
}
static int
diff --git a/test/ruby/test_weakmap.rb b/test/ruby/test_weakmap.rb
index 46d8b50c03..c482f697c3 100644
--- a/test/ruby/test_weakmap.rb
+++ b/test/ruby/test_weakmap.rb
@@ -167,4 +167,13 @@ class TestWeakMap < Test::Unit::TestCase
assert_nothing_raised(FrozenError) {@wm[o] = 'foo'}
assert_nothing_raised(FrozenError) {@wm['foo'] = o}
end
+
+ def test_no_memory_leak
+ assert_no_memory_leak([], '', "#{<<~"begin;"}\n#{<<~'end;'}", "[Bug #19398]", rss: true, limit: 1.5, timeout: 60)
+ begin;
+ 1_000_000.times do
+ ObjectSpace::WeakMap.new
+ end
+ end;
+ end
end
diff --git a/version.h b/version.h
index 68140f14ba..c601685980 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 4
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 202
+#define RUBY_PATCHLEVEL 203
#define RUBY_RELEASE_YEAR 2023
#define RUBY_RELEASE_MONTH 3