diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | thread.c | 5 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Fri Jan 16 01:42:50 2009 Koichi Sasada <ko1@atdot.net> + + * thread.c (call_trace_proc): as Matz said ([ruby-core:21183]), + should skip rb_str_new2() if rb_sourcefile() returns NULL. + rb_sourcefile() returns NULL if frame is toplevel of Fiber. + [ruby-core:21161] [Bug #985] + Fri Jan 16 01:09:37 2009 Koichi Sasada <ko1@atdot.net> * ruby.c (process_options): decrement parse_in_eval to recognize @@ -3624,8 +3624,9 @@ static VALUE call_trace_proc(VALUE args, int tracing) { struct call_trace_func_args *p = (struct call_trace_func_args *)args; + const char *srcfile = rb_sourcefile(); VALUE eventname = rb_str_new2(get_event_name(p->event)); - VALUE filename = rb_str_new2(rb_sourcefile()); + VALUE filename = srcfile ? rb_str_new2(srcfile) : Qnil; VALUE argv[6]; int line = rb_sourceline(); ID id = 0; @@ -3654,7 +3655,7 @@ call_trace_proc(VALUE args, int tracing) argv[1] = filename; argv[2] = INT2FIX(line); argv[3] = id ? ID2SYM(id) : Qnil; - argv[4] = p->self ? rb_binding_new() : Qnil; + argv[4] = (p->self && srcfile) ? rb_binding_new() : Qnil; argv[5] = klass ? klass : Qnil; return rb_proc_call_with_block(p->proc, 6, argv, Qnil); |