MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change die_info methods to check the attribute's form

Browse Source 
This changes two die_info methods to check the form of the attribute
before using it.

gdb/ChangeLog
2020-09-29  Tom Tromey  <tom@tromey.com>

	* dwarf2/die.h (struct die_info) <addr_base, ranges_base>: Check
	the attribute's form.
This commit is contained in:
Tom Tromey 2020-09-29 18:49:08 -06:00
parent e8e5c1585d
commit 52c14d1128
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2020-09-29 Tom Tromey <tom@tromey.com>
* dwarf2/die.h (struct die_info) <addr_base, ranges_base>: Check
the attribute's form.
2020-09-29 Tom Tromey <tom@tromey.com>
* dwarf2/read.c (is_valid_DW_AT_defaulted): Move to attribute.c.

22
gdb/dwarf2/die.h
View File

@ -20,6 +20,8 @@
#ifndef GDB_DWARF2_DIE_H
#define GDB_DWARF2_DIE_H
#include "complaints.h"
/* This data structure holds a complete die structure. */
struct die_info
{
@ -40,10 +42,15 @@ struct die_info
{
for (unsigned i = 0; i < num_attrs; ++i)
if (attrs[i].name == DW_AT_addr_base
|| attrs[i].name == DW_AT_GNU_addr_base)
|| attrs[i].name == DW_AT_GNU_addr_base)
{
/* If both exist, just use the first one. */
return DW_UNSND (&attrs[i]);
if (attrs[i].form_is_unsigned ())
{
/* If both exist, just use the first one. */
return attrs[i].as_unsigned ();
}
complaint (_("address base attribute (offset %s) as wrong form"),
sect_offset_str (sect_off));
}
return gdb::optional<ULONGEST> ();
}
@ -57,8 +64,13 @@ struct die_info
if (attrs[i].name == DW_AT_rnglists_base
|| attrs[i].name == DW_AT_GNU_ranges_base)
{
/* If both exist, just use the first one. */
return DW_UNSND (&attrs[i]);
if (attrs[i].form_is_unsigned ())
{
/* If both exist, just use the first one. */
return attrs[i].as_unsigned ();
}
complaint (_("ranges base attribute (offset %s) as wrong form"),
sect_offset_str (sect_off));
}
return 0;
}