* backport r33013 from trunk.

* iseq.c (iseq_s_disasm): fix a bug that may cause SEGV.

* test/ruby/test_method.rb (test_body): add a test for the above change.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33014 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 3 insertions, 3 deletions

diff --git a/iseq.c b/iseq.c
index c0cf98357f..9737d615c1 100644
--- a/iseq.c
+++ b/iseq.c
@@ -1030,9 +1030,9 @@ iseq_s_disasm(VALUE klass, VALUE body)
 	rb_proc_t *proc;
 	VALUE iseqval;
 	GetProcPtr(body, proc);
-	iseqval = proc->block.iseq->self;
-	if (RUBY_VM_NORMAL_ISEQ_P(iseqval)) {
-	    ret = rb_iseq_disasm(iseqval);
+	iseq = proc->block.iseq;
+	if (RUBY_VM_NORMAL_ISEQ_P(iseq)) {
+	    ret = rb_iseq_disasm(iseq->self);
 	}
     }
     else if ((iseq = rb_method_get_iseq(body)) != 0) {