kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

string.c: clear NOFREE flag at embedding

Browse source 
* 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/trunk@50334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-04-17 02:58:37 +00:00
parent 982a9d8e91
commit 26fa27fe12
3 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Fri Apr 17 11:58:34 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (STR_SET_EMBED): clear NOFREE flag at embedding as
embedded strings no longer refer static strings.
[ruby-core:68436] [Bug #10942]
Thu Apr 16 05:15:50 2015 Eric Wong <e@80x24.org> Thu Apr 16 05:15:50 2015 Eric Wong <e@80x24.org>
* NEWS: note IO#wait_readable change in r50263 * NEWS: note IO#wait_readable change in r50263

2
string.c
View file

@ -74,7 +74,7 @@ VALUE rb_cSymbol;
FL_SET((str), STR_NOEMBED);\ FL_SET((str), STR_NOEMBED);\
STR_SET_EMBED_LEN((str), 0);\ STR_SET_EMBED_LEN((str), 0);\
} while (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 { \ #define STR_SET_EMBED_LEN(str, n) do { \
long tmp_n = (n);\ long tmp_n = (n);\
RBASIC(str)->flags &= ~RSTRING_EMBED_LEN_MASK;\ RBASIC(str)->flags &= ~RSTRING_EMBED_LEN_MASK;\

10
test/-ext-/string/test_nofree.rb Normal file
View file

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