* dwarf2read.c (create_addrmap_from_index): Ignore bad address table

entries.
This commit is contained in:
Doug Evans
2013-08-09 17:26:40 +00:00
parent eb14d40688
commit 24a550149d
2 changed files with 16 additions and 4 deletions

View File

@ -1,3 +1,8 @@
2013-08-09 Doug Evans <dje@google.com>
* dwarf2read.c (create_addrmap_from_index): Ignore bad address table
entries.
2013-08-09 Sergio Durigan Junior <sergiodj@redhat.com> 2013-08-09 Sergio Durigan Junior <sergiodj@redhat.com>
* linux-tdep.c: Define enum with generic signal numbers. * linux-tdep.c: Define enum with generic signal numbers.

View File

@ -2570,17 +2570,24 @@ create_addrmap_from_index (struct objfile *objfile, struct mapped_index *index)
cu_index = extract_unsigned_integer (iter, 4, BFD_ENDIAN_LITTLE); cu_index = extract_unsigned_integer (iter, 4, BFD_ENDIAN_LITTLE);
iter += 4; iter += 4;
if (cu_index < dwarf2_per_objfile->n_comp_units) if (lo > hi)
{ {
addrmap_set_empty (mutable_map, lo + baseaddr, hi + baseaddr - 1, complaint (&symfile_complaints,
dw2_get_cu (cu_index)); _(".gdb_index address table has invalid range (%s - %s)"),
pulongest (lo), pulongest (hi));
continue;
} }
else
if (cu_index >= dwarf2_per_objfile->n_comp_units)
{ {
complaint (&symfile_complaints, complaint (&symfile_complaints,
_(".gdb_index address table has invalid CU number %u"), _(".gdb_index address table has invalid CU number %u"),
(unsigned) cu_index); (unsigned) cu_index);
continue;
} }
addrmap_set_empty (mutable_map, lo + baseaddr, hi + baseaddr - 1,
dw2_get_cu (cu_index));
} }
objfile->psymtabs_addrmap = addrmap_create_fixed (mutable_map, objfile->psymtabs_addrmap = addrmap_create_fixed (mutable_map,