/* DWARF 1 find nearest line (_bfd_dwarf1_find_nearest_line).
- Copyright (C) 1998-2017 Free Software Foundation, Inc.
+ Copyright (C) 1998-2022 Free Software Foundation, Inc.
Written by Gavin Romig-Koch of Cygnus Solutions (gavin@cygnus.com).
static struct dwarf1_unit*
alloc_dwarf1_unit (struct dwarf1_debug* stash)
{
- bfd_size_type amt = sizeof (struct dwarf1_unit);
+ size_t amt = sizeof (struct dwarf1_unit);
struct dwarf1_unit* x = (struct dwarf1_unit *) bfd_zalloc (stash->abfd, amt);
if (x)
static struct dwarf1_func *
alloc_dwarf1_func (struct dwarf1_debug* stash, struct dwarf1_unit* aUnit)
{
- bfd_size_type amt = sizeof (struct dwarf1_func);
+ size_t amt = sizeof (struct dwarf1_func);
struct dwarf1_func* x = (struct dwarf1_func *) bfd_zalloc (stash->abfd, amt);
if (x)
Return FALSE if the die is invalidly formatted; TRUE otherwise. */
-static bfd_boolean
-parse_die (bfd * abfd,
+static bool
+parse_die (bfd * abfd,
struct die_info * aDieInfo,
- bfd_byte * aDiePtr,
- bfd_byte * aDiePtrEnd)
+ bfd_byte * aDiePtr,
+ bfd_byte * aDiePtrEnd)
{
bfd_byte *this_die = aDiePtr;
bfd_byte *xptr = this_die;
memset (aDieInfo, 0, sizeof (* aDieInfo));
/* First comes the length. */
- aDieInfo->length = bfd_get_32 (abfd, (bfd_byte *) xptr);
+ if (xptr + 4 > aDiePtrEnd)
+ return false;
+ aDieInfo->length = bfd_get_32 (abfd, xptr);
xptr += 4;
- if (aDieInfo->length == 0
- || (this_die + aDieInfo->length) >= aDiePtrEnd)
- return FALSE;
+ if (aDieInfo->length <= 4
+ || (size_t) (aDiePtrEnd - this_die) < aDieInfo->length)
+ return false;
+ aDiePtrEnd = this_die + aDieInfo->length;
if (aDieInfo->length < 6)
{
/* Just padding bytes. */
aDieInfo->tag = TAG_padding;
- return TRUE;
+ return true;
}
/* Then the tag. */
- aDieInfo->tag = bfd_get_16 (abfd, (bfd_byte *) xptr);
+ if (xptr + 2 > aDiePtrEnd)
+ return false;
+ aDieInfo->tag = bfd_get_16 (abfd, xptr);
xptr += 2;
/* Then the attributes. */
- while (xptr < (this_die + aDieInfo->length))
+ while (xptr + 2 <= aDiePtrEnd)
{
+ unsigned int block_len;
unsigned short attr;
/* Parse the attribute based on its form. This section
- must handle all dwarf1 forms, but need only handle the
+ must handle all dwarf1 forms, but need only handle the
actual attributes that we care about. */
- attr = bfd_get_16 (abfd, (bfd_byte *) xptr);
+ attr = bfd_get_16 (abfd, xptr);
xptr += 2;
switch (FORM_FROM_ATTR (attr))
break;
case FORM_DATA4:
case FORM_REF:
- if (attr == AT_sibling)
- aDieInfo->sibling = bfd_get_32 (abfd, (bfd_byte *) xptr);
- else if (attr == AT_stmt_list)
+ if (xptr + 4 <= aDiePtrEnd)
{
- aDieInfo->stmt_list_offset = bfd_get_32 (abfd, (bfd_byte *) xptr);
- aDieInfo->has_stmt_list = 1;
+ if (attr == AT_sibling)
+ aDieInfo->sibling = bfd_get_32 (abfd, xptr);
+ else if (attr == AT_stmt_list)
+ {
+ aDieInfo->stmt_list_offset = bfd_get_32 (abfd, xptr);
+ aDieInfo->has_stmt_list = 1;
+ }
}
xptr += 4;
break;
xptr += 8;
break;
case FORM_ADDR:
- if (attr == AT_low_pc)
- aDieInfo->low_pc = bfd_get_32 (abfd, (bfd_byte *) xptr);
- else if (attr == AT_high_pc)
- aDieInfo->high_pc = bfd_get_32 (abfd, (bfd_byte *) xptr);
+ if (xptr + 4 <= aDiePtrEnd)
+ {
+ if (attr == AT_low_pc)
+ aDieInfo->low_pc = bfd_get_32 (abfd, xptr);
+ else if (attr == AT_high_pc)
+ aDieInfo->high_pc = bfd_get_32 (abfd, xptr);
+ }
xptr += 4;
break;
case FORM_BLOCK2:
- xptr += 2 + bfd_get_16 (abfd, (bfd_byte *) xptr);
+ if (xptr + 2 <= aDiePtrEnd)
+ {
+ block_len = bfd_get_16 (abfd, xptr);
+ if ((size_t) (aDiePtrEnd - xptr) < block_len)
+ return false;
+ xptr += block_len;
+ }
+ xptr += 2;
break;
case FORM_BLOCK4:
- xptr += 4 + bfd_get_32 (abfd, (bfd_byte *) xptr);
+ if (xptr + 4 <= aDiePtrEnd)
+ {
+ block_len = bfd_get_32 (abfd, xptr);
+ if ((size_t) (aDiePtrEnd - xptr) < block_len)
+ return false;
+ xptr += block_len;
+ }
+ xptr += 4;
break;
case FORM_STRING:
if (attr == AT_name)
aDieInfo->name = (char *) xptr;
- xptr += strlen ((char *) xptr) + 1;
+ xptr += strnlen ((char *) xptr, aDiePtrEnd - xptr) + 1;
break;
}
}
- return TRUE;
+ return true;
}
/* Parse a dwarf1 line number table for 'aUnit->stmt_list_offset'
into 'aUnit->linenumber_table'. Return FALSE if an error
occurs; TRUE otherwise. */
-static bfd_boolean
+static bool
parse_line_table (struct dwarf1_debug* stash, struct dwarf1_unit* aUnit)
{
bfd_byte *xptr;
msec = bfd_get_section_by_name (stash->abfd, ".line");
if (! msec)
- return FALSE;
+ return false;
size = msec->rawsize ? msec->rawsize : msec->size;
stash->line_section
(stash->abfd, msec, NULL, stash->syms);
if (! stash->line_section)
- return FALSE;
+ return false;
stash->line_section_end = stash->line_section + size;
}
xptr = stash->line_section + aUnit->stmt_list_offset;
- if (xptr < stash->line_section_end)
+ if (xptr + 8 <= stash->line_section_end)
{
unsigned long eachLine;
bfd_byte *tblend;
/* Allocate an array for the entries. */
amt = sizeof (struct linenumber) * aUnit->line_count;
aUnit->linenumber_table = (struct linenumber *) bfd_alloc (stash->abfd,
- amt);
+ amt);
if (!aUnit->linenumber_table)
- return FALSE;
+ return false;
for (eachLine = 0; eachLine < aUnit->line_count; eachLine++)
{
+ if (xptr + 10 > stash->line_section_end)
+ {
+ aUnit->line_count = eachLine;
+ break;
+ }
/* A line number. */
aUnit->linenumber_table[eachLine].linenumber
= bfd_get_32 (stash->abfd, (bfd_byte *) xptr);
}
}
- return TRUE;
+ return true;
}
/* Parse each function die in a compilation unit 'aUnit'.
the result is placed in 'aUnit->func_list'.
Return FALSE if error; TRUE otherwise. */
-static bfd_boolean
+static bool
parse_functions_in_unit (struct dwarf1_debug* stash, struct dwarf1_unit* aUnit)
{
bfd_byte *eachDie;
if (aUnit->first_child)
for (eachDie = aUnit->first_child;
- eachDie < stash->debug_section_end;
+ eachDie < stash->debug_section_end;
)
{
struct die_info eachDieInfo;
if (! parse_die (stash->abfd, &eachDieInfo, eachDie,
stash->debug_section_end))
- return FALSE;
+ return false;
if (eachDieInfo.tag == TAG_global_subroutine
|| eachDieInfo.tag == TAG_subroutine
{
struct dwarf1_func* aFunc = alloc_dwarf1_func (stash,aUnit);
if (!aFunc)
- return FALSE;
+ return false;
aFunc->name = eachDieInfo.name;
aFunc->low_pc = eachDieInfo.low_pc;
break;
}
- return TRUE;
+ return true;
}
/* Find the nearest line to 'addr' in 'aUnit'.
Return whether we found the line (or a function) without error. */
-static bfd_boolean
+static bool
dwarf1_unit_find_nearest_line (struct dwarf1_debug* stash,
struct dwarf1_unit* aUnit,
unsigned long addr,
const char **functionname_ptr,
unsigned int *linenumber_ptr)
{
- int line_p = FALSE;
- int func_p = FALSE;
+ int line_p = false;
+ int func_p = false;
if (aUnit->low_pc <= addr && addr < aUnit->high_pc)
{
if (! aUnit->linenumber_table)
{
if (! parse_line_table (stash, aUnit))
- return FALSE;
+ return false;
}
if (! aUnit->func_list)
{
if (! parse_functions_in_unit (stash, aUnit))
- return FALSE;
+ return false;
}
for (i = 0; i < aUnit->line_count; i++)
{
*filename_ptr = aUnit->name;
*linenumber_ptr = aUnit->linenumber_table[i].linenumber;
- line_p = TRUE;
+ line_p = true;
break;
}
}
&& addr < eachFunc->high_pc)
{
*functionname_ptr = eachFunc->name;
- func_p = TRUE;
+ func_p = true;
break;
}
}
/* The DWARF 1 version of find_nearest line.
Return TRUE if the line is found without error. */
-bfd_boolean
+bool
_bfd_dwarf1_find_nearest_line (bfd *abfd,
asymbol **symbols,
asection *section,
= (struct dwarf1_debug *) bfd_zalloc (abfd, size);
if (! stash)
- return FALSE;
+ return false;
msec = bfd_get_section_by_name (abfd, ".debug");
if (! msec)
/* No dwarf1 info. Note that at this point the stash
has been allocated, but contains zeros, this lets
future calls to this function fail quicker. */
- return FALSE;
+ return false;
size = msec->rawsize ? msec->rawsize : msec->size;
stash->debug_section
symbols);
if (! stash->debug_section)
- return FALSE;
+ return false;
stash->debug_section_end = stash->debug_section + size;
stash->currentDie = stash->debug_section;
or that an error occured while setting up the stash. */
if (! stash->debug_section)
- return FALSE;
+ return false;
/* Look at the previously parsed units to see if any contain
the addr. */
if (! parse_die (stash->abfd, &aDieInfo, stash->currentDie,
stash->debug_section_end))
- return FALSE;
+ return false;
if (aDieInfo.tag == TAG_compile_unit)
{
struct dwarf1_unit* aUnit
= alloc_dwarf1_unit (stash);
if (!aUnit)
- return FALSE;
+ return false;
aUnit->name = aDieInfo.name;
aUnit->low_pc = aDieInfo.low_pc;
not it's sibling. */
if (aDieInfo.sibling
&& stash->currentDie + aDieInfo.length
- < stash->debug_section_end
+ < stash->debug_section_end
&& stash->currentDie + aDieInfo.length
- != stash->debug_section + aDieInfo.sibling)
+ != stash->debug_section + aDieInfo.sibling)
aUnit->first_child = stash->currentDie + aDieInfo.length;
else
aUnit->first_child = 0;
stash->currentDie += aDieInfo.length;
}
- return FALSE;
+ return false;
}
projects / binutils-gdb.git / blobdiff