summaryrefslogtreecommitdiffstats
path: root/vm.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-17 06:14:59 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-17 06:14:59 +0000
commit666faa07ce04c044ecd4ea59e5f4885c07ee36f9 (patch)
tree05230d12a4bfc0c6d5bc340afd1fdf34d8eec30f /vm.c
parentc1e7d95b215b5960dfbda03847ca22ad7fd6f1c0 (diff)
merges r20742 from trunk into ruby_1_9_1.
* vm.c (vm_backtrace): defaults to script name for C functions. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20809 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r--vm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm.c b/vm.c
index 6c06a21c0..f91f3586e 100644
--- a/vm.c
+++ b/vm.c
@@ -704,7 +704,7 @@ vm_backtrace(rb_thread_t *th, int lev)
}
ary = vm_backtrace_each(th, RUBY_VM_NEXT_CONTROL_FRAME(cfp),
- top_of_cfp, "", 0, ary);
+ top_of_cfp, RSTRING_PTR(th->vm->progname), 0, ary);
return ary;
}