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

Fix memory leak in Hash#rehash for ST hashes

Browse Source 
We need to free the old ST table in Hash#rehash.

Co-authored-by: Adam Hess <adamhess1991@gmail.com>
This commit is contained in:
Peter Zhu 2023-09-22 19:16:21 -04:00
parent d80002c902
commit 61a2e9450c
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hash.c
View File

@ -685,9 +685,8 @@ ar_find_entry(VALUE hash, st_hash_t hash_value, st_data_t key)
return ar_find_entry_hint(hash, hint, key); return ar_find_entry_hint(hash, hint, key);
} }
//old one
static inline void static inline void
ar_free_and_clear_table(VALUE hash) hash_ar_free_and_clear_table(VALUE hash)
{ {
RHASH_AR_TABLE_CLEAR(hash); RHASH_AR_TABLE_CLEAR(hash);
@ -715,7 +714,7 @@ ar_try_convert_table(VALUE hash)
st_add_direct(new_tab, pair->key, pair->val); st_add_direct(new_tab, pair->key, pair->val);
} }
ar_free_and_clear_table(hash); hash_ar_free_and_clear_table(hash);
RHASH_ST_TABLE_SET(hash, new_tab); RHASH_ST_TABLE_SET(hash, new_tab);
} }
@ -742,7 +741,7 @@ ar_force_convert_table(VALUE hash, const char *file, int line)
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i); ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
st_add_direct(new_tab, pair->key, pair->val); st_add_direct(new_tab, pair->key, pair->val);
} }
ar_free_and_clear_table(hash); hash_ar_free_and_clear_table(hash);
} }
RHASH_ST_TABLE_SET(hash, new_tab); RHASH_ST_TABLE_SET(hash, new_tab);
@ -1161,7 +1160,7 @@ ar_clear(VALUE hash)
} }
static void static void
st_free_and_clear_table(VALUE hash) hash_st_free_and_clear_table(VALUE hash)
{ {
HASH_ASSERT(RHASH_ST_TABLE_P(hash)); HASH_ASSERT(RHASH_ST_TABLE_P(hash));
@ -1962,7 +1961,8 @@ rb_hash_rehash(VALUE hash)
if (RHASH_AR_TABLE_P(hash)) { if (RHASH_AR_TABLE_P(hash)) {
tmp = hash_alloc(0); tmp = hash_alloc(0);
rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp); rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
ar_free_and_clear_table(hash);
hash_ar_free_and_clear_table(hash);
ar_copy(hash, tmp); ar_copy(hash, tmp);
} }
else if (RHASH_ST_TABLE_P(hash)) { else if (RHASH_ST_TABLE_P(hash)) {
@ -1974,6 +1974,7 @@ rb_hash_rehash(VALUE hash)
rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp); rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
hash_st_free_and_clear_table(hash);
RHASH_ST_TABLE_SET(hash, tbl); RHASH_ST_TABLE_SET(hash, tbl);
RHASH_ST_CLEAR(tmp); RHASH_ST_CLEAR(tmp);
} }
@ -2906,10 +2907,10 @@ rb_hash_replace(VALUE hash, VALUE hash2)
COPY_DEFAULT(hash, hash2); COPY_DEFAULT(hash, hash2);
if (RHASH_AR_TABLE_P(hash)) { if (RHASH_AR_TABLE_P(hash)) {
ar_free_and_clear_table(hash); hash_ar_free_and_clear_table(hash);
} }
else { else {
st_free_and_clear_table(hash); hash_st_free_and_clear_table(hash);
} }
hash_copy(hash, hash2); hash_copy(hash, hash2);

15
test/ruby/test_hash.rb
View File

@ -744,6 +744,21 @@ class TestHash < Test::Unit::TestCase
assert_equal(100, h[a]) assert_equal(100, h[a])
end end
def test_rehash_memory_leak
assert_no_memory_leak([], <<~PREP, <<~CODE, rss: true)
ar_hash = 1.times.map { |i| [i, i] }.to_h
st_hash = 10.times.map { |i| [i, i] }.to_h
code = proc do
ar_hash.rehash
st_hash.rehash
end
1_000.times(&code)
PREP
1_000_000.times(&code)
CODE
end
def test_reject def test_reject
assert_equal({3=>4,5=>6}, @cls[1=>2,3=>4,5=>6].reject {|k, v| k + v < 7 }) assert_equal({3=>4,5=>6}, @cls[1=>2,3=>4,5=>6].reject {|k, v| k + v < 7 })