summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-06-18 13:27:05 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-06-18 13:40:04 +0900
commit8b3774be3dd9f472bddd99e84e3c9fe2ff99d7ac (patch)
tree48a18447eefef52c3df17d5f52b5408fb4008e61 /string.c
parentc770c98ac42ee20129f1296d9f7c4dad2ae45124 (diff)
Fix memory leak
* string.c (str_make_independent_expand): free independent buffer. [Bug# 15935] Co-Authored-By: luke-gru (Luke Gruber) <luke.gru@gmail.com>
Diffstat (limited to 'string.c')
-rw-r--r--string.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/string.c b/string.c
index e811e8aa9d..fdb7e4003c 100644
--- a/string.c
+++ b/string.c
@@ -2069,7 +2069,7 @@ static void
str_make_independent_expand(VALUE str, long len, long expand, const int termlen)
{
char *ptr;
- const char *oldptr;
+ char *oldptr;
long capa = len + expand;
if (len > capa) len = capa;
@@ -2088,6 +2088,9 @@ str_make_independent_expand(VALUE str, long len, long expand, const int termlen)
if (oldptr) {
memcpy(ptr, oldptr, len);
}
+ if (FL_TEST_RAW(str, STR_NOEMBED|STR_NOFREE|STR_SHARED) == STR_NOEMBED) {
+ xfree(oldptr);
+ }
STR_SET_NOEMBED(str);
FL_UNSET(str, STR_SHARED|STR_NOFREE);
TERM_FILL(ptr + len, termlen);