From: Alan Modra <amodra@gmail.com>
To: binutils@sourceware.org
Subject: Fix memory leak in bfd_get_debug_link_info_1
Date: Thu, 30 Mar 2023 15:20:10 +1030 [thread overview]
Message-ID: <ZCUVAjKL5j0X5DTH@squeak.grove.modra.org> (raw)
* opncls.c (bfd_get_alt_debug_link_info): Don't bother freeing
after bfd_malloc_and_get_section failure.
(get_build_id): Likewise.
(bfd_get_debug_link_info_1): Likewise. Free section contents
when crc not present.
* section.c (bfd_malloc_and_get_section): Document that the
buffer is NULL on error return.
diff --git a/bfd/opncls.c b/bfd/opncls.c
index abea464baa4..81e124457e9 100644
--- a/bfd/opncls.c
+++ b/bfd/opncls.c
@@ -1211,10 +1211,7 @@ bfd_get_debug_link_info_1 (bfd *abfd, void *crc32_out)
return NULL;
if (!bfd_malloc_and_get_section (abfd, sect, &contents))
- {
- free (contents);
- return NULL;
- }
+ return NULL;
/* CRC value is stored after the filename, aligned up to 4 bytes. */
name = (char *) contents;
@@ -1222,7 +1219,10 @@ bfd_get_debug_link_info_1 (bfd *abfd, void *crc32_out)
crc_offset = strnlen (name, size) + 1;
crc_offset = (crc_offset + 3) & ~3;
if (crc_offset + 4 > size)
- return NULL;
+ {
+ free (name);
+ return NULL;
+ }
*crc32 = bfd_get_32 (abfd, contents + crc_offset);
return name;
@@ -1297,10 +1297,7 @@ bfd_get_alt_debug_link_info (bfd * abfd, bfd_size_type *buildid_len,
return NULL;
if (!bfd_malloc_and_get_section (abfd, sect, & contents))
- {
- free (contents);
- return NULL;
- }
+ return NULL;
/* BuildID value is stored after the filename. */
name = (char *) contents;
@@ -1817,10 +1814,7 @@ get_build_id (bfd *abfd)
}
if (!bfd_malloc_and_get_section (abfd, sect, & contents))
- {
- free (contents);
- return NULL;
- }
+ return NULL;
/* FIXME: Paranoia - allow for compressed build-id sections.
Maybe we should complain if this size is different from
diff --git a/bfd/section.c b/bfd/section.c
index 3b1993b60a5..1e7e8ac7522 100644
--- a/bfd/section.c
+++ b/bfd/section.c
@@ -1600,6 +1600,8 @@ SYNOPSIS
DESCRIPTION
Read all data from @var{section} in BFD @var{abfd}
into a buffer, *@var{buf}, malloc'd by this function.
+ Return @code{true} on success, @code{false} on failure in which
+ case *@var{buf} will be NULL.
*/
bool
--
Alan Modra
Australia Development Lab, IBM
reply other threads:[~2023-03-30 4:50 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=ZCUVAjKL5j0X5DTH@squeak.grove.modra.org \
--to=amodra@gmail.com \
--cc=binutils@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).