summaryrefslogtreecommitdiff
path: root/variable.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-20 12:22:17 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-03-20 12:22:17 +0000
commit4b72c61d46d0e6a27b8b48865d539ed50c804850 (patch)
treee92a49ed3e4313971fb850a0b86229a528c38bb5 /variable.c
parente7ee0b13d63325254c8efae2fe4d7c5d9a909608 (diff)
merge revision(s) r45350: [Backport #9645]
* 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/branches/ruby_2_0_0@45373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'variable.c')
-rw-r--r--variable.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/variable.c b/variable.c
index 79e00bef79..0c2f8e5841 100644
--- a/variable.c
+++ b/variable.c
@@ -2183,6 +2183,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);
}
}
}