aboutsummaryrefslogtreecommitdiff
path: root/binutils
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2022-12-18 13:07:51 +1030
committerAlan Modra <amodra@gmail.com>2022-12-19 22:30:36 +1030
commit956bc7a29fd952d709db29667b38f98cdd3db4c9 (patch)
tree32139bea67ec5b7bb7a08957bb1bd345338c902e /binutils
parent37e5833da583310268dc1b04fc6839e81b987897 (diff)
downloadgdb-956bc7a29fd952d709db29667b38f98cdd3db4c9.zip
gdb-956bc7a29fd952d709db29667b38f98cdd3db4c9.tar.gz
gdb-956bc7a29fd952d709db29667b38f98cdd3db4c9.tar.bz2
Tidy PR29893 and PR29908 fix
PR 29893 PR 29908 * dwarf.c (display_debug_addr): Combine dwarf5 unit_length checks. Delete dead code.
Diffstat (limited to 'binutils')
-rw-r--r--binutils/dwarf.c24
1 files changed, 4 insertions, 20 deletions
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index b792902..a00568d 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -7738,19 +7738,14 @@ display_debug_addr (struct dwarf_section *section,
SAFE_BYTE_GET_AND_INC (length, curr_header, 4, entry);
if (length == 0xffffffff)
SAFE_BYTE_GET_AND_INC (length, curr_header, 8, entry);
- if (length > (size_t) (section->start + section->size - curr_header))
+ if (length > (size_t) (section->start + section->size - curr_header)
+ || length < (size_t) (entry - curr_header))
{
warn (_("Corrupt %s section: unit_length field of %#" PRIx64
- " too large\n"), section->name, length);
+ " is invalid\n"), section->name, length);
return 0;
}
end = curr_header + length;
- if (end < entry)
- {
- warn (_("Corrupt %s section header: length field (%lx) is too small\n"),
- section->name, (long) length);
- return 0;
- }
SAFE_BYTE_GET_AND_INC (version, curr_header, 2, entry);
if (version != 5)
warn (_("Corrupt %s section: expecting version number 5 in header but found %d instead\n"),
@@ -7761,18 +7756,7 @@ display_debug_addr (struct dwarf_section *section,
address_size += segment_selector_size;
}
else
- {
- end = section->start + debug_addr_info [i + 1]->addr_base;
-
- if (end < entry)
- {
- warn (_("Corrupt %s section: address base of entry %u (%lx) is less than entry %u (%lx)\n"),
- section->name,
- i, (long) debug_addr_info [i]->addr_base,
- i + 1, (long) debug_addr_info [i + 1]->addr_base);
- return 0;
- }
- }
+ end = section->start + debug_addr_info [i + 1]->addr_base;
header = end;
idx = 0;