summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-06-16 23:41:06 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-06-16 23:51:22 +0900
commit53e9908d8afc7f03109b0aafd1698ab35f512b05 (patch)
tree453b5977d99a2218dd4fac9f662835ebab33665f /string.c
parentd4929f518562b4e346af57f724232595b674f2b0 (diff)
Fix memory leak
* string.c (str_replace_shared_without_enc): free previous buffer before replaced. * parse.y (gettable): make sure in advance that the `__FILE__` object shares a fstring, to get rid of replacement with the fstring later. TODO: this hack may be needed in other places. [Bug #15916] Co-Authored-By: luke-gru (Luke Gruber) <luke.gru@gmail.com>
Diffstat (limited to 'string.c')
-rw-r--r--string.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/string.c b/string.c
index b37b8542c7..186c71b40c 100644
--- a/string.c
+++ b/string.c
@@ -1162,6 +1162,13 @@ str_replace_shared_without_enc(VALUE str2, VALUE str)
}
else {
str = rb_str_new_frozen(str);
+ if (!STR_EMBED_P(str2) && !FL_TEST_RAW(str2, STR_SHARED|STR_NOFREE)) {
+ /* TODO: check if str2 is a shared root */
+ char *ptr2 = STR_HEAP_PTR(str2);
+ if (STR_HEAP_PTR(str) != ptr2) {
+ ruby_sized_xfree(ptr2, STR_HEAP_SIZE(str2));
+ }
+ }
FL_SET(str2, STR_NOEMBED);
RSTRING_GETMEM(str, ptr, len);
RSTRING(str2)->as.heap.len = len;