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

2 files changed, 9 insertions, 6 deletions

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);
diff --git a/version.h b/version.h
index 0e6be70d94..5d42d3061c 100644
--- a/version.h
+++ b/version.h
@@ -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"