yugui	2009-01-16 13:06:54 +0900 (Fri, 16 Jan 2009)

  New Revision: 21593

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21593

  Log:
    merges r21578 from trunk into ruby_1_9_1.
    * 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]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/thread.c

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21592)
+++ ruby_1_9_1/ChangeLog	(revision 21593)
@@ -1,3 +1,10 @@
+Fri Jan 16 01:42:50 2009  Koichi Sasada  <ko1@a...>
+
+	* 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  9 12:29:46 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (test-sample), rubytest.rb: use runruby.rb
Index: ruby_1_9_1/thread.c
===================================================================
--- ruby_1_9_1/thread.c	(revision 21592)
+++ ruby_1_9_1/thread.c	(revision 21593)
@@ -3591,8 +3591,9 @@
 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;
@@ -3621,7 +3622,7 @@
     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);

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/