diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-04 12:10:09 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-04 12:10:09 +0000 |
commit | 92a05ea2cf375e415ddd420243d0e38801708f8a (patch) | |
tree | 4f7741ae3ff738482c615ecd8319963ce7e03fb9 | |
parent | 0688c81a89e506f426df8b58cb57a706477bf95c (diff) | |
download | ruby-92a05ea2cf375e415ddd420243d0e38801708f8a.tar.gz |
* class.c (class_alloc): allocate extra memory after containing
object setup to get rid of rare-but-potential memory leak.
* gc.c (gc_mark_children): skip marking extended members if ptr is
NULL.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | class.c | 3 | ||||
-rw-r--r-- | gc.c | 1 |
3 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Tue Oct 4 21:10:08 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * class.c (class_alloc): allocate extra memory after containing + object setup to get rid of rare-but-potential memory leak. + + * gc.c (gc_mark_children): skip marking extended members if ptr is + NULL. + Tue Oct 4 16:17:50 2011 NARUSE, Yui <naruse@ruby-lang.org> * lib/time.rb (Time.strptime): use Time.at if d[:seconds] is set. @@ -49,10 +49,9 @@ static ID id_attached; static VALUE class_alloc(VALUE flags, VALUE klass) { - rb_classext_t *ext = ALLOC(rb_classext_t); NEWOBJ(obj, struct RClass); OBJSETUP(obj, klass, flags); - obj->ptr = ext; + obj->ptr = ALLOC(rb_classext_t); RCLASS_IV_TBL(obj) = 0; RCLASS_CONST_TBL(obj) = 0; RCLASS_M_TBL(obj) = 0; @@ -1824,6 +1824,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev) case T_CLASS: case T_MODULE: mark_m_tbl(objspace, RCLASS_M_TBL(obj), lev); + if (!RCLASS_EXT(obj)) break; mark_tbl(objspace, RCLASS_IV_TBL(obj), lev); mark_const_tbl(objspace, RCLASS_CONST_TBL(obj), lev); ptr = RCLASS_SUPER(obj); |