OpenE2K/binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prevent an assertion failure in readelf & objdump when parsing corrupt DWARF information.

Browse Source 
PR 23062
	* dwarf.c (read_and_display_attr_value): Replace assertions with
	test and warning message.
This commit is contained in:
Nick Clifton 2018-04-18 12:03:03 +01:00
parent 82deb12e5f
commit a7504f87d4
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
binutils/ChangeLog
View File

@ -1,3 +1,9 @@
2018-04-18 Nick Clifton <nickc@redhat.com>
PR 23062
* dwarf.c (read_and_display_attr_value): Replace assertions with
test and warning message.
2018-04-18 Alan Modra <amodra@gmail.com>
* testsuite/lib/binutils-common.exp: Remove support for assorted

25
binutils/dwarf.c
View File

@ -2174,19 +2174,28 @@ read_and_display_attr_value (unsigned long attribute,
debug_info_p->have_frame_base [num] = have_frame_base;
if (attribute != DW_AT_GNU_locviews)
{
debug_info_p->loc_offsets [num] = uvalue;
debug_info_p->num_loc_offsets++;
assert (debug_info_p->num_loc_offsets
- debug_info_p->num_loc_views <= 1);
/* Corrupt DWARF info can produce more offsets than views.
See PR 23062 for an example. */
if (debug_info_p->num_loc_offsets
> debug_info_p->num_loc_views)
warn (_("More location offset attributes than DW_AT_GNU_locview attributes\n"));
else
{
debug_info_p->loc_offsets [num] = uvalue;
debug_info_p->num_loc_offsets++;
}
}
else
{
assert (debug_info_p->num_loc_views <= num);
num = debug_info_p->num_loc_views;
debug_info_p->loc_views [num] = uvalue;
debug_info_p->num_loc_views++;
assert (debug_info_p->num_loc_views
- debug_info_p->num_loc_offsets <= 1);
if (num > debug_info_p->num_loc_offsets)
warn (_("More DW_AT_GNU_locview attributes than location offset attributes\n"));
else
{
debug_info_p->loc_views [num] = uvalue;
debug_info_p->num_loc_views++;
}
}
}
break;