diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-01 15:04:05 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-11-01 15:04:05 +0000 |
commit | 55c6c4edda5c72138b1c1387d217d246f14039b6 (patch) | |
tree | 666c306799969c8aa7ff320cda65aee711f33431 /vm.c | |
parent | c1fafacd1232e78a006e799620da859d70432cc1 (diff) |
merges r29205 from trunk into ruby_1_9_2.
--
* vm.c (vm_backtrace_each): skip allocator frames which have no
name. [ruby-core:32231]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@29665 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm.c')
-rw-r--r-- | vm.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -741,7 +741,8 @@ vm_backtrace_each(rb_thread_t *th, int lev, void (*init)(void *), rb_backtrace_i id = cfp->me->def->original_id; else id = cfp->me->called_id; - if ((*iter)(arg, file, line_no, rb_id2str(id))) break; + if (id != ID_ALLOCATOR && (*iter)(arg, file, line_no, rb_id2str(id))) + break; } cfp = RUBY_VM_NEXT_CONTROL_FRAME(cfp); } |