merges r29136 from trunk into ruby_1_9_2.

--
* vm.c (rb_thread_method_id_and_class): curried proc has no
  method.  [ruby-core:31871]

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

1 files changed, 1 insertions, 1 deletions

diff --git a/vm.c b/vm.c
index 8938df9d51..e235314b99 100644
--- a/vm.c
+++ b/vm.c
@@ -1396,7 +1396,7 @@ rb_thread_method_id_and_class(rb_thread_t *th,
 {
     rb_control_frame_t *cfp = th->cfp;
     rb_iseq_t *iseq = cfp->iseq;
-    if (!iseq) {
+    if (!iseq && cfp->me) {
 	if (idp) *idp = cfp->me->def->original_id;
 	if (klassp) *klassp = cfp->me->klass;
 	return 1;