diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | test/ruby/test_const.rb | 8 | ||||
| -rw-r--r-- | variable.c | 2 | ||||
| -rw-r--r-- | version.h | 8 |
4 files changed, 20 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Mon Jun 2 01:46:43 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 + Fri May 30 00:13:19 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (setup_exception): preserve errinfo across calling #to_s diff --git a/test/ruby/test_const.rb b/test/ruby/test_const.rb index dab45b7e08..c4a4d93249 100644 --- a/test/ruby/test_const.rb +++ b/test/ruby/test_const.rb @@ -1,5 +1,6 @@ # -*- coding: us-ascii -*- require 'test/unit' +require_relative 'envutil' class TestConst < Test::Unit::TestCase TEST1 = 1 @@ -54,5 +55,12 @@ class TestConst < Test::Unit::TestCase #{__FILE__}:#{__LINE__-1}: warning: already initialized constant #{c}::X #{__FILE__}:#{__LINE__-3}: warning: previous definition of X was here 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 diff --git a/variable.c b/variable.c index 424730dcb9..e53dc8207f 100644 --- a/variable.c +++ b/variable.c @@ -2203,6 +2203,8 @@ rb_const_set(VALUE klass, ID id, VALUE val) rb_compile_warn(RSTRING_PTR(ce->file), ce->line, "previous definition of %"PRIsVALUE" was here", name); } + st_delete(RCLASS_CONST_TBL(klass), &id, 0); + xfree(ce); } } } @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.2" -#define RUBY_RELEASE_DATE "2014-05-30" -#define RUBY_PATCHLEVEL 117 +#define RUBY_RELEASE_DATE "2014-06-02" +#define RUBY_PATCHLEVEL 118 #define RUBY_RELEASE_YEAR 2014 -#define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 30 +#define RUBY_RELEASE_MONTH 6 +#define RUBY_RELEASE_DAY 2 #include "ruby/version.h" |