diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-30 21:11:41 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2020-03-30 21:11:41 +0000 |
commit | 07ae2fe9d0b6b7920fe75b8e856b87d50777b7a4 (patch) | |
tree | 0f3d31e650e5b18a8dc3f0a63195521bda903feb | |
parent | dcc0a529b77f4b0b2a85a7719f3495af5f8ab734 (diff) |
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) <luke.gru@gmail.com>
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
-rw-r--r-- | string.c | 5 | ||||
-rw-r--r-- | version.h | 10 |
2 files changed, 9 insertions, 6 deletions
@@ -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); @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.5.8" -#define RUBY_RELEASE_DATE "2019-12-04" -#define RUBY_PATCHLEVEL 209 +#define RUBY_RELEASE_DATE "2020-03-31" +#define RUBY_PATCHLEVEL 210 -#define RUBY_RELEASE_YEAR 2019 -#define RUBY_RELEASE_MONTH 12 -#define RUBY_RELEASE_DAY 4 +#define RUBY_RELEASE_YEAR 2020 +#define RUBY_RELEASE_MONTH 3 +#define RUBY_RELEASE_DAY 31 #include "ruby/version.h" |