archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 78ef2d0f33: [Backport #15935]

Browse source 
merge revision(s) 8b3774be3d: [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
This commit is contained in:
usa 2020-03-30 21:11:41 +00:00
parent dcc0a529b7
commit 07ae2fe9d0
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
string.c
View file

@ -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);

10
version.h
View file

@ -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"