diff options
| author | nagachika <nagachika@ruby-lang.org> | 2024-07-15 13:24:57 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2024-07-15 13:24:57 +0900 |
| commit | 519d164b6682a8b9fde2b1d5ab7d74f54c4f0224 (patch) | |
| tree | 2c2b41643796f5014aad2e1adb28bfa580ad19a0 /encoding.c | |
| parent | db45554fef4c8e1b0ba494965449db13068e6051 (diff) | |
merge revision(s) c7ce2f537f96ab2cf2f5fc2982d6147866ff5340: [Backport #20304]
Fix memory leak in setting encodings
There is a memory leak in Encoding.default_external= and
Encoding.default_internal= because the duplicated name is not freed
when overwriting.
10.times do
1_000_000.times do
Encoding.default_internal = nil
end
puts `ps -o rss= -p #{$$}`
end
Before:
25664
41504
57360
73232
89168
105056
120944
136816
152720
168576
After:
9648
9648
9648
9680
9680
9680
9680
9680
9680
9680
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c index 39a47f2b8c..2f4b47bdfa 100644 --- a/encoding.c +++ b/encoding.c @@ -1556,7 +1556,14 @@ enc_set_default_encoding(struct default_encoding *def, VALUE encoding, const cha if (NIL_P(encoding)) { def->index = -1; def->enc = 0; - st_insert(enc_table->names, (st_data_t)strdup(name), + char *name_dup = strdup(name); + + st_data_t existing_name = (st_data_t)name_dup; + if (st_delete(enc_table->names, &existing_name, NULL)) { + xfree((void *)existing_name); + } + + st_insert(enc_table->names, (st_data_t)name_dup, (st_data_t)UNSPECIFIED_ENCODING); } else { |