diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | addr2line.c | 11 | ||||
| -rw-r--r-- | vm_dump.c | 9 |
3 files changed, 20 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Sat Dec 22 02:19:38 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * vm_dump.c (rb_vm_bugreport): revert r38533. + * addr2line.c (fill_lines): add ELF sanity check. + [Bug #7597] [ruby-dev:46786] + Sat Dec 22 02:05:00 2012 Zachary Scott <zachary@zacharyscott.net> * lib/irb/inspector.rb, lib/irb/context.rb: Move IRB::INSPECTORS and diff --git a/addr2line.c b/addr2line.c index e102abba4f..04a48e751d 100644 --- a/addr2line.c +++ b/addr2line.c @@ -493,6 +493,16 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink, return; } + ehdr = (ElfW(Ehdr) *)file; + if (memcmp(ehdr->e_ident, "\177ELF", 4) != 0) { + /* + * Huh? Maybe filename was overridden by setproctitle() and + * it match non-elf file. + */ + close(fd); + return; + } + current_line->fd = fd; current_line->mapped = file; current_line->mapped_size = (size_t)filesize; @@ -506,7 +516,6 @@ fill_lines(int num_traces, void **traces, char **syms, int check_debuglink, } } - ehdr = (ElfW(Ehdr) *)file; shdr = (ElfW(Shdr) *)(file + ehdr->e_shoff); shstr_shdr = shdr + ehdr->e_shstrndx; @@ -644,15 +644,14 @@ rb_vm_bugreport(void) char **syms = backtrace_symbols(trace, n); if (syms) { -/* commentout temporarily. we have to fix addr2line. see [Bug #7597] */ -/* #ifdef USE_ELF */ -/* rb_dump_backtrace_with_lines(n, trace, syms); */ -/* #else */ +#ifdef USE_ELF + rb_dump_backtrace_with_lines(n, trace, syms); +#else int i; for (i=0; i<n; i++) { fprintf(stderr, "%s\n", syms[i]); } -/* #endif */ +#endif free(syms); } #elif defined(_WIN32) |