From f190d6284359da8ae8694b2d2e14b01602a959ed Mon Sep 17 00:00:00 2001 From: Andrew Hsieh Date: Wed, 18 Jun 2014 13:00:04 -0700 Subject: Merge GCC 4.8.3 Change-Id: I0abe59f7705b3eccc6b2f123af75b2e30917696a --- gcc-4.8/libbacktrace/elf.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'gcc-4.8/libbacktrace/elf.c') diff --git a/gcc-4.8/libbacktrace/elf.c b/gcc-4.8/libbacktrace/elf.c index ef9bcdfb4..9d2dfd3fe 100644 --- a/gcc-4.8/libbacktrace/elf.c +++ b/gcc-4.8/libbacktrace/elf.c @@ -725,6 +725,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; @@ -751,8 +753,13 @@ elf_add (struct backtrace_state *state, int descriptor, uintptr_t base_address, descriptor = -1; for (i = 0; i < (int) DEBUG_MAX; ++i) + { + 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, -- cgit v1.2.3