From 43e8a7a3ebb77b270de3c54c0c01d681070953ad Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 28 Jul 2011 15:50:00 +0000 Subject: * backport r32669 from trunk. * proc.c (struct METHOD), gc.c (gc_marks), vm_method.c (rb_gc_mark_unlinked_live_method_entries): fix SEGV bug. rb_method_entry_t was free'd even when the method is still on the stack if it is BMETHOD (i.e., Method#call). This is because rb_method_entry_t is embedded in struct METHOD. This commit separates them and marks the live method entries. See [ruby-core:38449] in detail. fix [Bug #5047] [ruby-core:38171] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32728 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_method.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'vm_method.c') diff --git a/vm_method.c b/vm_method.c index 226ce476c1..239b3887cb 100644 --- a/vm_method.c +++ b/vm_method.c @@ -86,7 +86,7 @@ rb_add_method_cfunc(VALUE klass, ID mid, VALUE (*func)(ANYARGS), int argc, rb_me } } -static void +void rb_unlink_method_entry(rb_method_entry_t *me) { struct unlinked_method_entry_list_entry *ume = ALLOC(struct unlinked_method_entry_list_entry); @@ -95,6 +95,20 @@ rb_unlink_method_entry(rb_method_entry_t *me) GET_VM()->unlinked_method_entry_list = ume; } +void +rb_gc_mark_unlinked_live_method_entries(void *pvm) +{ + rb_vm_t *vm = pvm; + struct unlinked_method_entry_list_entry *ume = vm->unlinked_method_entry_list, *prev_ume = 0, *curr_ume; + + while (ume) { + if (ume->me->mark) { + rb_mark_method_entry(ume->me); + } + ume = ume->next; + } +} + void rb_sweep_method_entry(void *pvm) { -- cgit v1.2.3