1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm_insnhelper.c: Fix one type of symbol leak with +send+

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49499 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2015-02-04 19:03:04 +00:00
parent 8350b7dc04
commit 454f89e2ea
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
test/ruby/test_symbol.rb
View File

@ -238,4 +238,24 @@ class TestSymbol < Test::Unit::TestCase
200_000.times { |i| i.to_s.to_sym } 200_000.times { |i| i.to_s.to_sym }
end; end;
end end
def assert_no_immortal_symbol_created
delta = -Symbol.all_symbols.size
yield
GC.start
delta += Symbol.all_symbols.size
assert_equal 0, delta, "#{delta} immortal symbols were created"
end
def test_symbol_send_leak_string
assert_no_immortal_symbol_created do
10.times { 42.send "send should not leak #{i} - str" rescue nil }
end
end
def test_symbol_send_leak_symbol
assert_no_immortal_symbol_created do
10.times { 42.send "send should not leak #{i} - sym".to_sym rescue nil }
end
end
end end

5
vm_insnhelper.c
View File

@ -1526,10 +1526,7 @@ vm_call_opt_send(rb_thread_t *th, rb_control_frame_t *reg_cfp, rb_call_info_t *c
sym = TOPN(i); sym = TOPN(i);
if (SYMBOL_P(sym)) { if (!(ci->mid = rb_check_id(&sym))) {
ci->mid = SYM2ID(sym);
}
else if (!(ci->mid = rb_check_id(&sym))) {
if (rb_method_basic_definition_p(CLASS_OF(ci->recv), idMethodMissing)) { if (rb_method_basic_definition_p(CLASS_OF(ci->recv), idMethodMissing)) {
VALUE exc = make_no_method_exception(rb_eNoMethodError, NULL, ci->recv, rb_long2int(ci->argc), &TOPN(i)); VALUE exc = make_no_method_exception(rb_eNoMethodError, NULL, ci->recv, rb_long2int(ci->argc), &TOPN(i));
rb_exc_raise(exc); rb_exc_raise(exc);