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

comdat_hash memory leaks

Browse Source 
Entries added to the hash table with bfd_malloc ought to be freed when
the hash table is deleted.  This patch adds the necessary del_f to the
htab_create call, and delays creating the table until an
IMAGE_SCN_LNK_COMDAT symbol is read.

	* peicode.h (pe_mkobject): Move comdat_hash creation..
	(htab_hash_flags, htab_eq_flags): ..and these support functions..
	* coffcode.h (handle_COMDAT): ..to here, renaming support to
	(comdat_hashf, comdat_eqf): ..this and adding..
	(comdat_delf): ..this new function.
This commit is contained in:
Alan Modra
2023-08-27 13:19:01 +09:30
parent 26d0081b52
commit 8606b47e94
2 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
bfd/coffcode.h
View File

@@ -853,6 +853,29 @@ styp_to_sec_flags (bfd *abfd,
#else /* COFF_WITH_PE */
static hashval_t
comdat_hashf (const void *entry)
{
const struct comdat_hash_entry *fe = entry;
return fe->target_index;
}
static int
comdat_eqf (const void *e1, const void *e2)
{
const struct comdat_hash_entry *fe1 = e1;
const struct comdat_hash_entry *fe2 = e2;
return fe1->target_index == fe2->target_index;
}
static void
comdat_delf (void *ent)
{
struct comdat_hash_entry *e = ent;
free (e->symname);
free (e);
}
static struct comdat_hash_entry *
find_flags (htab_t comdat_hash, int target_index)
{
@@ -1085,6 +1108,14 @@ static bool
handle_COMDAT (bfd *abfd, flagword *sec_flags, const char *name,
asection *section)
{
if (pe_data (abfd)->comdat_hash == NULL)
{
pe_data (abfd)->comdat_hash = htab_create (10, comdat_hashf, comdat_eqf,
comdat_delf);
if (pe_data (abfd)->comdat_hash == NULL)
return false;
}
if (htab_elements (pe_data (abfd)->comdat_hash) == 0)
if (! fill_comdat_hash (abfd))
return false;

17
bfd/peicode.h
View File

@@ -255,21 +255,6 @@ coff_swap_scnhdr_in (bfd * abfd, void * ext, void * in)
#endif
}
static hashval_t
htab_hash_flags (const void *entry)
{
const struct comdat_hash_entry *fe = entry;
return fe->target_index;
}
static int
htab_eq_flags (const void *e1, const void *e2)
{
const struct comdat_hash_entry *fe1 = e1;
const struct comdat_hash_entry *fe2 = e2;
return fe1->target_index == fe2->target_index;
}
static bool
pe_mkobject (bfd * abfd)
{
@@ -306,8 +291,6 @@ pe_mkobject (bfd * abfd)
pe->dos_message[14] = 0x24;
pe->dos_message[15] = 0x0;
pe->comdat_hash = htab_create (10, htab_hash_flags, htab_eq_flags, NULL);
memset (& pe->pe_opthdr, 0, sizeof pe->pe_opthdr);
bfd_coff_long_section_names (abfd)