1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* vm.c (vm_backtrace_each): progname is not available at

initializing phase.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21935 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-02-02 00:49:40 +00:00
parent 7b5c9eb041
commit a2d8643e93
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Mon Feb 2 09:49:39 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (vm_backtrace_each): progname is not available at
initializing phase.
Mon Feb 2 08:12:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Feb 2 08:12:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/xmlrpc/server.rb (Server#serve): gets rid of hardcoded * lib/xmlrpc/server.rb (Server#serve): gets rid of hardcoded

4
vm.c
View file

@ -692,7 +692,7 @@ vm_backtrace_each(rb_thread_t *th, int lev, rb_backtrace_iter_func *iter, void *
{ {
const rb_control_frame_t *limit_cfp = th->cfp; const rb_control_frame_t *limit_cfp = th->cfp;
const rb_control_frame_t *cfp = (void *)(th->stack + th->stack_size); const rb_control_frame_t *cfp = (void *)(th->stack + th->stack_size);
const char *file; const char *file = "ruby";
int line_no = 0; int line_no = 0;
cfp -= 2; cfp -= 2;
@ -702,7 +702,7 @@ vm_backtrace_each(rb_thread_t *th, int lev, rb_backtrace_iter_func *iter, void *
} }
} }
limit_cfp = RUBY_VM_NEXT_CONTROL_FRAME(limit_cfp); limit_cfp = RUBY_VM_NEXT_CONTROL_FRAME(limit_cfp);
file = RSTRING_PTR(th->vm->progname); if (th->vm->progname) file = RSTRING_PTR(th->vm->progname);
while (cfp > limit_cfp) { while (cfp > limit_cfp) {
if (cfp->iseq != 0) { if (cfp->iseq != 0) {
if (cfp->pc != 0) { if (cfp->pc != 0) {