Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-27 09:38:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re: Move nm.c cached line number info to bfd usrdata

Browse Source 
Commit e3f450f393 resulted in a nm -l segfault on object files
without undefined symbols.  Fix that, and be paranoid about bfd
section count changing.

	* nm.c (struct lineno_cache): Add seccount.
	(free_lineno_cache): Don't segfault on NULL lc->relocs.
	(print_symbol): Stash section count when creating arrays.
This commit is contained in:
Alan Modra
2023-03-08 09:19:38 +10:30
parent d64c8f7181
commit 160f200778
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
binutils/nm.c
View File

@@ -62,6 +62,7 @@ struct lineno_cache
long *relcount;
asymbol **syms;
long symcount;
unsigned int seccount;
};
struct extended_symbol_info
@@ -1165,9 +1166,8 @@ free_lineno_cache (bfd *abfd)
if (lc)
{
unsigned int seccount = bfd_count_sections (abfd);
for (unsigned int i = 0; i < seccount; i++)
if (lc->relocs[i] != NULL)
if (lc->relocs)
for (unsigned int i = 0; i < lc->seccount; i++)
free (lc->relocs[i]);
free (lc->relcount);
free (lc->relocs);
@@ -1254,12 +1254,13 @@ print_symbol (bfd * abfd,
{
unsigned int i;
const char *symname;
unsigned int seccount = bfd_count_sections (abfd);
/* For an undefined symbol, we try to find a reloc for the
symbol, and print the line number of the reloc. */
if (lc->relocs == NULL)
{
unsigned int seccount = bfd_count_sections (abfd);
lc->seccount = seccount;
lc->secs = xmalloc (seccount * sizeof (*lc->secs));
lc->relocs = xmalloc (seccount * sizeof (*lc->relocs));
lc->relcount = xmalloc (seccount * sizeof (*lc->relcount));
@@ -1269,7 +1270,7 @@ print_symbol (bfd * abfd,
}
symname = bfd_asymbol_name (sym);
for (i = 0; i < seccount; i++)
for (i = 0; i < lc->seccount; i++)
{
long j;
@@ -1290,7 +1291,7 @@ print_symbol (bfd * abfd,
{
/* We only print the first one we find. */
printf ("\t%s:%u", filename, lineno);
i = seccount;
i = lc->seccount;
break;
}
}