* eval.c (rb_frame_callee): check if prev_cfp can be accessible.

  a patch from Yoshinori Sano <yoshinori.sano at gmail.com> in
  [ruby-dev:30252].  solves [ruby-dev:30200] and [ruby-core:9856].

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 1 deletions

diff --git a/eval.c b/eval.c
index 639649616..e8e2e7061 100644
--- a/eval.c
+++ b/eval.c
@@ -1879,7 +1879,13 @@ rb_frame_this_func(void)
 ID
 rb_frame_callee(void)
 {
-    return frame_func_id(GET_THREAD()->cfp + 1);
+    yarv_thread_t *th = GET_THREAD();
+    yarv_control_frame_t *prev_cfp = YARV_PREVIOUS_CONTROL_FRAME(th->cfp);
+    /* check if prev_cfp can be accessible */
+    if ((void *)(th->stack + th->stack_size) == (void *)(prev_cfp)) {
+        return 0;
+    }
+    return frame_func_id(prev_cfp);
 }
 
 void