FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR27884, skip_attr_bytes: Assertion (data) <= (end) failed

Browse source 
PR 27884
	* dwarf.c (get_type_abbrev_from_form): Replace cu_offset_return
	param with map_return, and return map for DW_FORM_ref_addr.
	(get_type_signedness): Adjust calls to get_type_abbrev_from_form.
	Pass returned cu map start and end to recursive call.
	(read_and_display_attr_value): Similarly.
This commit is contained in:
Alan Modra 2021-05-18 23:41:10 +09:30
parent 9d9e2a340b
commit 1b3892bedc
2 changed files with 32 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
binutils/ChangeLog
View file

@ -1,3 +1,12 @@
2021-05-19 Alan Modra <amodra@gmail.com>
PR 27884
* dwarf.c (get_type_abbrev_from_form): Replace cu_offset_return
param with map_return, and return map for DW_FORM_ref_addr.
(get_type_signedness): Adjust calls to get_type_abbrev_from_form.
Pass returned cu map start and end to recursive call.
(read_and_display_attr_value): Similarly.
2021-05-19 Alan Modra <amodra@gmail.com>
PR 27879

42
binutils/dwarf.c
View file

@ -2059,13 +2059,13 @@ skip_attr_bytes (unsigned long form,
associated with it. */
static abbrev_entry *
get_type_abbrev_from_form (unsigned long form,
unsigned long uvalue,
dwarf_vma cu_offset,
const struct dwarf_section * section,
unsigned long * abbrev_num_return,
unsigned char ** data_return,
unsigned long * cu_offset_return)
get_type_abbrev_from_form (unsigned long form,
unsigned long uvalue,
dwarf_vma cu_offset,
const struct dwarf_section *section,
unsigned long *abbrev_num_return,
unsigned char **data_return,
abbrev_map **map_return)
{
unsigned long abbrev_number;
abbrev_map * map;
@ -2132,12 +2132,12 @@ get_type_abbrev_from_form (unsigned long form,
return NULL;
}
if (cu_offset_return != NULL)
if (map_return != NULL)
{
if (form == DW_FORM_ref_addr)
* cu_offset_return = map->start;
*map_return = map;
else
* cu_offset_return = cu_offset;
*map_return = NULL;
}
READ_ULEB (abbrev_number, data, section->start + section->size);
@ -2214,21 +2214,23 @@ get_type_signedness (abbrev_entry *entry,
case DW_AT_type:
/* Recurse. */
{
abbrev_entry * type_abbrev;
unsigned char * type_data;
unsigned long type_cu_offset;
abbrev_entry *type_abbrev;
unsigned char *type_data;
abbrev_map *map;
type_abbrev = get_type_abbrev_from_form (attr->form,
uvalue,
cu_offset,
section,
NULL /* abbrev num return */,
& type_data,
& type_cu_offset);
&type_data,
&map);
if (type_abbrev == NULL)
break;
get_type_signedness (type_abbrev, section, type_data, end, type_cu_offset,
get_type_signedness (type_abbrev, section, type_data,
map ? section->start + map->end : end,
map ? map->start : cu_offset,
pointer_size, offset_size, dwarf_version,
is_signed, nesting + 1);
}
@ -2951,13 +2953,15 @@ read_and_display_attr_value (unsigned long attribute,
bool is_signed = false;
abbrev_entry *type_abbrev;
unsigned char *type_data;
unsigned long type_cu_offset;
abbrev_map *map;
type_abbrev = get_type_abbrev_from_form (form, uvalue, cu_offset,
section, NULL, & type_data, & type_cu_offset);
section, NULL, &type_data, &map);
if (type_abbrev != NULL)
{
get_type_signedness (type_abbrev, section, type_data, end, type_cu_offset,
get_type_signedness (type_abbrev, section, type_data,
map ? section->start + map->end : end,
map ? map->start : cu_offset,
pointer_size, offset_size, dwarf_version,
& is_signed, 0);
}