From 7c9904b29ec16ddce76fb167ab20afca4a571476 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 18 Feb 2011 10:43:38 +0000 Subject: [PATCH] merges r30659 from trunk into ruby_1_9_2. -- * class.c (clone_method): add GC guard to prevent intermediate variable from GC. [Bug #4321] [ruby-dev:43107] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ class.c | 4 +++- version.h | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a511efc0ee..a30143fa3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jan 26 22:57:30 2011 CHIKANAGA Tomoyuki + + * class.c (clone_method): add GC guard to prevent intermediate + variable from GC. [Bug #4321] [ruby-dev:43107] + Wed Jan 26 22:28:49 2011 CHIKANAGA Tomoyuki * vm_eval.c (rb_throw_obj): add GC guard to prevent intermediate diff --git a/class.c b/class.c index 84576f1a77..8d759739c3 100644 --- a/class.c +++ b/class.c @@ -127,11 +127,13 @@ VALUE rb_iseq_clone(VALUE iseqval, VALUE newcbase); 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); diff --git a/version.h b/version.h index 706df0f4fe..0cb23bf1cc 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.2" -#define RUBY_PATCHLEVEL 175 +#define RUBY_PATCHLEVEL 176 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1