From f4c39c7ccba57bcc71ab92760f4194b3e4667bb7 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Tue, 26 Apr 2011 17:15:28 +0200 Subject: [PATCH] libdw: Sanity check end of section against cu_data () of die->cu. A Dwarf_CU can come from either the debug_info compile unit or a debug_type type unit section. Use the correct one for sanity checking whether we have a truncated section. --- libdw/ChangeLog | 5 +++++ libdw/dwarf_child.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/libdw/ChangeLog b/libdw/ChangeLog index 0b1746185..8febd4287 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,8 @@ +2011-04-26 Mark Wielaard + + * dwarf_child (dwarf_child): Sanity check end of section against + cu_data () of die->cu. + 2011-03-22 Mark Wielaard * dwarf.h: Add DW_TAG_GNU_call_site, diff --git a/libdw/dwarf_child.c b/libdw/dwarf_child.c index 1ec3704e4..0c2df0041 100644 --- a/libdw/dwarf_child.c +++ b/libdw/dwarf_child.c @@ -177,13 +177,13 @@ dwarf_child (die, result) /* RESULT can be the same as DIE. So preserve what we need. */ struct Dwarf_CU *cu = die->cu; + Elf_Data *cu_sec = cu_data (cu); /* It's kosher (just suboptimal) to have a null entry first thing (7.5.3). So if this starts with ULEB128 of 0 (even with silly encoding of 0), it is a kosher null entry and we do not really have any children. */ const unsigned char *code = addr; - const unsigned char *endp = (cu->dbg->sectiondata[IDX_debug_info]->d_buf - + cu->dbg->sectiondata[IDX_debug_info]->d_size); + const unsigned char *endp = (cu_sec->d_buf + cu_sec->d_size); while (1) { if (unlikely (code >= endp)) /* Truncated section. */ -- 2.47.2