summaryrefslogtreecommitdiff
path: root/variable.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-01 16:55:58 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-06-01 16:55:58 +0000
commit5a22835c22c3d95968b418c31cd23a28f978890f (patch)
tree7e163352611880a343b2bba38e1a9d53c612dbd0 /variable.c
parentfca433e2fdc014b742d22dcbd0d62e4ad83a1cea (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_1@46301 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 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);
}
}
}