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

variable.c: avoid memory leak on const redefinition

Browse Source 
* variable.c (rb_const_set): delete existing entry on redefinition
  [Bug #9645]
* test/ruby/test_const.rb (test_redefinition): test for leak

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
normal 2014-03-17 01:24:06 +00:00
parent 2be728c45f
commit 3e6fe414d8
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Mar 17 10:11:59 2014 Eric Wong <e@80x24.org>
* variable.c (rb_const_set): delete existing entry on redefinition
[Bug #9645]
* test/ruby/test_const.rb (test_redefinition): test for leak
Sun Mar 16 21:33:01 2014 Zachary Scott <e@zzak.io> Sun Mar 16 21:33:01 2014 Zachary Scott <e@zzak.io>
* lib/time.rb: [DOC] Fix timezone in example of Time.parse [Bug #9521] * lib/time.rb: [DOC] Fix timezone in example of Time.parse [Bug #9521]

8
test/ruby/test_const.rb
View File

@ -1,5 +1,6 @@
# -*- coding: us-ascii -*- # -*- coding: us-ascii -*-
require 'test/unit' require 'test/unit'
require_relative 'envutil'
class TestConst < Test::Unit::TestCase class TestConst < Test::Unit::TestCase
TEST1 = 1 TEST1 = 1
@ -54,5 +55,12 @@ class TestConst < Test::Unit::TestCase
#{__FILE__}:#{__LINE__-1}: warning: already initialized constant #{c}::X #{__FILE__}:#{__LINE__-1}: warning: already initialized constant #{c}::X
#{__FILE__}:#{__LINE__-3}: warning: previous definition of X was here #{__FILE__}:#{__LINE__-3}: warning: previous definition of X was here
WARNING WARNING
code = <<-PRE
olderr = $stderr.dup
$stderr.reopen(File::NULL, "wb")
350000.times { FOO = :BAR }
$stderr.reopen(olderr)
PRE
assert_no_memory_leak([], '', code, 'redefined constant')
end end
end end

2
variable.c
View File

@ -2203,6 +2203,8 @@ rb_const_set(VALUE klass, ID id, VALUE val)
rb_compile_warn(RSTRING_PTR(ce->file), ce->line, rb_compile_warn(RSTRING_PTR(ce->file), ce->line,
"previous definition of %"PRIsVALUE" was here", name); "previous definition of %"PRIsVALUE" was here", name);
} }
st_delete(RCLASS_CONST_TBL(klass), &id, 0);
xfree(ce);
} }
} }
} }