mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
0688c81a89
commit
92a05ea2cf
3 changed files with 10 additions and 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>
|
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.
|
* lib/time.rb (Time.strptime): use Time.at if d[:seconds] is set.
|
||||||
|
|
3
class.c
3
class.c
|
@ -49,10 +49,9 @@ static ID id_attached;
|
||||||
static VALUE
|
static VALUE
|
||||||
class_alloc(VALUE flags, VALUE klass)
|
class_alloc(VALUE flags, VALUE klass)
|
||||||
{
|
{
|
||||||
rb_classext_t *ext = ALLOC(rb_classext_t);
|
|
||||||
NEWOBJ(obj, struct RClass);
|
NEWOBJ(obj, struct RClass);
|
||||||
OBJSETUP(obj, klass, flags);
|
OBJSETUP(obj, klass, flags);
|
||||||
obj->ptr = ext;
|
obj->ptr = ALLOC(rb_classext_t);
|
||||||
RCLASS_IV_TBL(obj) = 0;
|
RCLASS_IV_TBL(obj) = 0;
|
||||||
RCLASS_CONST_TBL(obj) = 0;
|
RCLASS_CONST_TBL(obj) = 0;
|
||||||
RCLASS_M_TBL(obj) = 0;
|
RCLASS_M_TBL(obj) = 0;
|
||||||
|
|
1
gc.c
1
gc.c
|
@ -1824,6 +1824,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr, int lev)
|
||||||
case T_CLASS:
|
case T_CLASS:
|
||||||
case T_MODULE:
|
case T_MODULE:
|
||||||
mark_m_tbl(objspace, RCLASS_M_TBL(obj), lev);
|
mark_m_tbl(objspace, RCLASS_M_TBL(obj), lev);
|
||||||
|
if (!RCLASS_EXT(obj)) break;
|
||||||
mark_tbl(objspace, RCLASS_IV_TBL(obj), lev);
|
mark_tbl(objspace, RCLASS_IV_TBL(obj), lev);
|
||||||
mark_const_tbl(objspace, RCLASS_CONST_TBL(obj), lev);
|
mark_const_tbl(objspace, RCLASS_CONST_TBL(obj), lev);
|
||||||
ptr = RCLASS_SUPER(obj);
|
ptr = RCLASS_SUPER(obj);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue