* bfd/elf.c strtab memory leak
@ 2023-06-07 2:00 Alan Modra
0 siblings, 0 replies; 2+ messages in thread
From: Alan Modra @ 2023-06-07 2:00 UTC (permalink / raw)
To: binutils
* elf.c (_bfd_elf_compute_section_file_positions): Free strtab
on set_group_contents failure return path.
diff --git a/bfd/elf.c b/bfd/elf.c
index 81eb3ef71fa..af2fb04dcbe 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -4254,7 +4254,11 @@ _bfd_elf_compute_section_file_positions (bfd *abfd,
{
bfd_map_over_sections (abfd, bfd_elf_set_group_contents, &failed);
if (failed)
- return false;
+ {
+ if (need_symtab)
+ _bfd_elf_strtab_free (strtab);
+ return false;
+ }
}
shstrtab_hdr = &elf_tdata (abfd)->shstrtab_hdr;
--
Alan Modra
Australia Development Lab, IBM
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: bfd/elf.c strtab memory leak
@ 2023-06-14 4:57 Alan Modra
0 siblings, 0 replies; 2+ messages in thread
From: Alan Modra @ 2023-06-14 4:57 UTC (permalink / raw)
To: binutils
There are other places that leak the strtab.
* elf.c (_bfd_elf_compute_section_file_positions): Free strtab
on error paths.
diff --git a/bfd/elf.c b/bfd/elf.c
index c4e2f89a16e..8f6d7d1adba 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -4254,11 +4254,7 @@ _bfd_elf_compute_section_file_positions (bfd *abfd,
{
bfd_map_over_sections (abfd, bfd_elf_set_group_contents, &failed);
if (failed)
- {
- if (need_symtab)
- _bfd_elf_strtab_free (strtab);
- return false;
- }
+ goto err_free_strtab;
}
shstrtab_hdr = &elf_tdata (abfd)->shstrtab_hdr;
@@ -4274,9 +4270,9 @@ _bfd_elf_compute_section_file_positions (bfd *abfd,
shstrtab_hdr->sh_addralign = 1;
if (!assign_file_positions_except_relocs (abfd, link_info))
- return false;
+ goto err_free_strtab;
- if (need_symtab)
+ if (strtab != NULL)
{
file_ptr off;
Elf_Internal_Shdr *hdr;
@@ -4303,13 +4299,17 @@ _bfd_elf_compute_section_file_positions (bfd *abfd,
out. */
if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0
|| ! _bfd_elf_strtab_emit (abfd, strtab))
- return false;
+ goto err_free_strtab;
_bfd_elf_strtab_free (strtab);
}
abfd->output_has_begun = true;
-
return true;
+
+ err_free_strtab:
+ if (strtab != NULL)
+ _bfd_elf_strtab_free (strtab);
+ return false;
}
/* Retrieve .eh_frame_hdr. Prior to size_dynamic_sections the
--
Alan Modra
Australia Development Lab, IBM
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-14 4:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-07 2:00 bfd/elf.c strtab memory leak Alan Modra
2023-06-14 4:57 Alan Modra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).