From: Alan Modra <amodra@sourceware.org>
To: bfd-cvs@sourceware.org
Subject: [binutils-gdb] Re: bfd/elf.c strtab memory leak
Date: Wed, 14 Jun 2023 04:57:50 +0000 (GMT) [thread overview]
Message-ID: <20230614045750.336DC3858031@sourceware.org> (raw)
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=48375c36dc59e3c0e6b9bf38f17f4692bddb578f
commit 48375c36dc59e3c0e6b9bf38f17f4692bddb578f
Author: Alan Modra <amodra@gmail.com>
Date: Wed Jun 14 13:46:56 2023 +0930
Re: bfd/elf.c strtab memory leak
There are other places that leak the strtab.
* elf.c (_bfd_elf_compute_section_file_positions): Free strtab
on error paths.
Diff:
---
bfd/elf.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
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
reply other threads:[~2023-06-14 4:57 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230614045750.336DC3858031@sourceware.org \
--to=amodra@sourceware.org \
--cc=bfd-cvs@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).