From 20ef4699e510f89ad4e9ccbeafa2d3d725ed2d3c Mon Sep 17 00:00:00 2001 From: nagachika Date: Tue, 19 May 2015 19:52:07 +0000 Subject: [PATCH] merge revision(s) 50334,50337: [Backport #10942] * string.c (STR_SET_EMBED): clear NOFREE flag at embedding as embedded strings no longer refer static strings. [ruby-core:68436] [Bug #10942] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50550 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/-test-/string/nofree.c | 13 +++++++++++++ string.c | 2 +- test/-ext-/string/test_nofree.rb | 10 ++++++++++ version.h | 2 +- 5 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 ext/-test-/string/nofree.c create mode 100644 test/-ext-/string/test_nofree.rb diff --git a/ChangeLog b/ChangeLog index 616b43c4cf..e0bfd8ff15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed May 20 04:33:50 2015 Nobuyoshi Nakada + + * string.c (STR_SET_EMBED): clear NOFREE flag at embedding as + embedded strings no longer refer static strings. + [ruby-core:68436] [Bug #10942] + Wed May 20 03:46:11 2015 Nobuyoshi Nakada * dir.c (need_normalization): use getattrlist() if fgetattrlist() diff --git a/ext/-test-/string/nofree.c b/ext/-test-/string/nofree.c new file mode 100644 index 0000000000..d3d8071ff9 --- /dev/null +++ b/ext/-test-/string/nofree.c @@ -0,0 +1,13 @@ +#include "ruby.h" + +VALUE +bug_str_nofree(VALUE self) +{ + return rb_str_new_cstr("abcdef"); +} + +void +Init_nofree(VALUE klass) +{ + rb_define_singleton_method(klass, "nofree", bug_str_nofree, 0); +} diff --git a/string.c b/string.c index 2652b291a5..1753b37bdc 100644 --- a/string.c +++ b/string.c @@ -60,7 +60,7 @@ VALUE rb_cSymbol; FL_SET((str), STR_NOEMBED);\ STR_SET_EMBED_LEN((str), 0);\ } while (0) -#define STR_SET_EMBED(str) FL_UNSET((str), STR_NOEMBED) +#define STR_SET_EMBED(str) FL_UNSET((str), (STR_NOEMBED|STR_NOFREE)) #define STR_SET_EMBED_LEN(str, n) do { \ long tmp_n = (n);\ RBASIC(str)->flags &= ~RSTRING_EMBED_LEN_MASK;\ diff --git a/test/-ext-/string/test_nofree.rb b/test/-ext-/string/test_nofree.rb new file mode 100644 index 0000000000..234c84dba1 --- /dev/null +++ b/test/-ext-/string/test_nofree.rb @@ -0,0 +1,10 @@ +require 'test/unit' + +class Test_StringNoFree < Test::Unit::TestCase + def test_no_memory_leak + bug10942 = '[ruby-core:68436] [Bug #10942] no leak on nofree string' + assert_no_memory_leak(%w(-r-test-/string/string), '', + '1000000.times {Bug::String.nofree << "a" * 100}', + bug10942, rss: true, limit: 2.0) + end +end diff --git a/version.h b/version.h index 70ff6ed44a..9b782286f7 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.3" #define RUBY_RELEASE_DATE "2015-05-20" -#define RUBY_PATCHLEVEL 109 +#define RUBY_PATCHLEVEL 110 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 5