diff options
| author | NARUSE, Yui <nurse@users.noreply.github.com> | 2024-03-22 09:25:36 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-22 00:25:36 +0000 |
| commit | a24802e8fd7e05077256605885c82ffd8221bc94 (patch) | |
| tree | 7dbe2c8d0fb866dd8a21435c23b842e0996ca7df | |
| parent | eb7cb164cffc86b63d2e2528c73e160c33b7a2e5 (diff) | |
merge revision(s) c7ce2f537f96ab2cf2f5fc2982d6147866ff5340: [Backport #20304] (#10311)
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
| -rw-r--r-- | encoding.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c index 1ede6a677c..a0be931c97 100644 --- a/encoding.c +++ b/encoding.c @@ -1543,7 +1543,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 { |