[前][次][番号順一覧][スレッド一覧]

ruby-changes:18635

From: nagachika <ko1@a...>
Date: Wed, 26 Jan 2011 23:00:04 +0900 (JST)
Subject: [ruby-changes:18635] Ruby:r30659 (trunk): * class.c (clone_method): add GC guard to prevent intermediate

nagachika	2011-01-26 22:59:20 +0900 (Wed, 26 Jan 2011)

  New Revision: 30659

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30659

  Log:
    * class.c (clone_method): add GC guard to prevent intermediate
      variable from GC. [Bug #4321] [ruby-dev:43107]

  Modified files:
    trunk/ChangeLog
    trunk/class.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30658)
+++ ChangeLog	(revision 30659)
@@ -1,3 +1,8 @@
+Wed Jan 26 22:57:30 2011  CHIKANAGA Tomoyuki  <nagachika00@g...>
+
+	* class.c (clone_method): add GC guard to prevent intermediate
+	  variable from GC. [Bug #4321] [ruby-dev:43107]
+
 Wed Jan 26 22:45:16 2011  Tanaka Akira  <akr@f...>
 
 	* template/id.h.tmpl: parenthesize macro arguments.
Index: class.c
===================================================================
--- class.c	(revision 30658)
+++ class.c	(revision 30659)
@@ -129,11 +129,13 @@
 static int
 clone_method(ID mid, const rb_method_entry_t *me, struct clone_method_data *data)
 {
+    VALUE newiseqval;
     if (me->def && me->def->type == VM_METHOD_TYPE_ISEQ) {
-	VALUE newiseqval = rb_iseq_clone(me->def->body.iseq->self, data->klass);
 	rb_iseq_t *iseq;
+	newiseqval = rb_iseq_clone(me->def->body.iseq->self, data->klass);
 	GetISeqPtr(newiseqval, iseq);
 	rb_add_method(data->klass, mid, VM_METHOD_TYPE_ISEQ, iseq, me->flag);
+	RB_GC_GUARD(newiseqval);
     }
     else {
 	rb_method_entry_set(data->klass, mid, me, me->flag);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]