From 1b99a27b11b816e20a8cf86d5ee09098f4eba965 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 20 Feb 2010 16:26:58 +0000
Subject: * vm.c (vm_backtrace_each): use called_id when method definition  
 structure is already freed.  [ruby-dev:40234] [ruby-core:27959]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26718 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'vm.c')

diff --git a/vm.c b/vm.c
index 6cfea72e33..96a04bfcba 100644
--- a/vm.c
+++ b/vm.c
@@ -731,8 +731,14 @@ vm_backtrace_each(rb_thread_t *th, int lev, rb_backtrace_iter_func *iter, void *
 	    }
 	}
 	else if (RUBYVM_CFUNC_FRAME_P(cfp)) {
+	    ID id;
+
 	    if (NIL_P(file)) file = rb_str_new_cstr("ruby");
-	    if ((*iter)(arg, file, line_no, rb_id2str(cfp->me->def->original_id))) break;
+	    if (cfp->me->def)
+		id = cfp->me->def->original_id;
+	    else
+		id = cfp->me->called_id;
+	    if ((*iter)(arg, file, line_no, rb_id2str(id))) break;
 	}
 	cfp = RUBY_VM_NEXT_CONTROL_FRAME(cfp);
     }
-- 
cgit v1.2.3