From 07ae2fe9d0b6b7920fe75b8e856b87d50777b7a4 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 30 Mar 2020 21:11:41 +0000 Subject: merge revision(s) 78ef2d0f331c3e056ee367214710b41722de2fe0: [Backport #15935] merge revision(s) 8b3774be3dd9f472bddd99e84e3c9fe2ff99d7ac: [Backport #15935] Fix memory leak * string.c (str_make_independent_expand): free independent buffer. [Bug# 15935] Co-Authored-By: luke-gru (Luke Gruber) git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67805 b2dd03c8-39d4-4d8f-98ff-823fe69b080e git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'string.c') diff --git a/string.c b/string.c index ed7da23649..f0d1a286a5 100644 --- a/string.c +++ b/string.c @@ -2043,7 +2043,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; @@ -2062,6 +2062,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); -- cgit v1.2.3