summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-16 12:46:17 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-16 12:46:17 +0000
commit8bd4d73e85e09be3d7d96660853d6ae09541be8b (patch)
treedba5a5a4e5f0d1885077ed4798b8275d5a7cf8da /proc.c
parent2479d4264ec55578d1629ba6762de85cb5004553 (diff)
merges r27817 from trunk into ruby_1_9_2.
-- * proc.c (proc_binding): don't propagative filename and line_no of binding that is created from C level. [ruby-dev:41322] * vm_eval.c (eval_string_with_cref): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@27846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/proc.c b/proc.c
index fc05a8eae0..b4ecd576c8 100644
--- a/proc.c
+++ b/proc.c
@@ -1897,8 +1897,14 @@ proc_binding(VALUE self)
bindval = binding_alloc(rb_cBinding);
GetBindingPtr(bindval, bind);
bind->env = proc->envval;
- bind->filename = proc->block.iseq->filename;
- bind->line_no = rb_iseq_first_lineno(proc->block.iseq);
+ if (RUBY_VM_NORMAL_ISEQ_P(proc->block.iseq)) {
+ bind->filename = proc->block.iseq->filename;
+ bind->line_no = rb_iseq_first_lineno(proc->block.iseq);
+ }
+ else {
+ bind->filename = Qnil;
+ bind->line_no = 0;
+ }
return bindval;
}