From 6c084a5b37919e3343d58bd8f6e8badd133ba9fc Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 18 Oct 2013 04:24:48 +0000 Subject: [PATCH] elf.c (elf_add): Don't get the wrong offsets if a debug section is missing. * elf.c (elf_add): Don't get the wrong offsets if a debug section is missing. From-SVN: r203810 --- libbacktrace/ChangeLog | 5 +++++ libbacktrace/elf.c | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog index 9c6a8839f5e..86536a16adb 100644 --- a/libbacktrace/ChangeLog +++ b/libbacktrace/ChangeLog @@ -1,3 +1,8 @@ +2013-10-17 Ian Lance Taylor + + * elf.c (elf_add): Don't get the wrong offsets if a debug section + is missing. + 2013-10-15 David Malcolm * configure.ac: Add --enable-host-shared, setting up diff --git a/libbacktrace/elf.c b/libbacktrace/elf.c index c1dbc5492e0..2161ad2a258 100644 --- a/libbacktrace/elf.c +++ b/libbacktrace/elf.c @@ -759,6 +759,8 @@ elf_add (struct backtrace_state *state, int descriptor, uintptr_t base_address, { off_t end; + if (sections[i].size == 0) + continue; if (min_offset == 0 || sections[i].offset < min_offset) min_offset = sections[i].offset; end = sections[i].offset + sections[i].size; @@ -785,8 +787,13 @@ elf_add (struct backtrace_state *state, int descriptor, uintptr_t base_address, descriptor = -1; for (i = 0; i < (int) DEBUG_MAX; ++i) - sections[i].data = ((const unsigned char *) debug_view.data - + (sections[i].offset - min_offset)); + { + if (sections[i].size == 0) + sections[i].data = NULL; + else + sections[i].data = ((const unsigned char *) debug_view.data + + (sections[i].offset - min_offset)); + } if (!backtrace_dwarf_add (state, base_address, sections[DEBUG_INFO].data,