From: Alan Modra <amodra@gmail.com>
To: binutils@sourceware.org
Subject: alpha-vms: memory leak
Date: Fri, 28 Feb 2020 02:57:00 -0000 [thread overview]
Message-ID: <20200228025713.GK32593@bubble.grove.modra.org> (raw)
* vms-lib.c (_bfd_vms_lib_archive_p): Free memory on error paths.
diff --git a/bfd/vms-lib.c b/bfd/vms-lib.c
index 29e213f8c3..65fd70a720 100644
--- a/bfd/vms-lib.c
+++ b/bfd/vms-lib.c
@@ -623,12 +623,16 @@ _bfd_vms_lib_archive_p (bfd *abfd, enum vms_lib_kind kind)
if (sbm_off > reclen
|| reclen - sbm_off < sizeof (struct vms_dcxsbm))
- goto err;
+ {
+ err_free_buf:
+ free (buf);
+ goto err;
+ }
sbm = (struct vms_dcxsbm *) (buf + sbm_off);
sbm_sz = bfd_getl16 (sbm->size);
sbm_off += sbm_sz;
if (sbm_off > reclen)
- goto err;
+ goto err_free_buf;
sbmdesc->min_char = sbm->min_char;
BFD_ASSERT (sbmdesc->min_char == 0);
@@ -638,25 +642,25 @@ _bfd_vms_lib_archive_p (bfd *abfd, enum vms_lib_kind kind)
if (sbm_sz < sizeof (struct vms_dcxsbm) + l + sbm_len
|| (tdata->nbr_dcxsbm > 1
&& sbm_sz < sizeof (struct vms_dcxsbm) + l + 3 * sbm_len))
- goto err;
+ goto err_free_buf;
sbmdesc->flags = (unsigned char *)bfd_alloc (abfd, l);
off = bfd_getl16 (sbm->flags);
if (off > sbm_sz
|| sbm_sz - off < l)
- goto err;
+ goto err_free_buf;
memcpy (sbmdesc->flags, (bfd_byte *) sbm + off, l);
sbmdesc->nodes = (unsigned char *)bfd_alloc (abfd, 2 * sbm_len);
off = bfd_getl16 (sbm->nodes);
if (off > sbm_sz
|| sbm_sz - off < 2 * sbm_len)
- goto err;
+ goto err_free_buf;
memcpy (sbmdesc->nodes, (bfd_byte *) sbm + off, 2 * sbm_len);
off = bfd_getl16 (sbm->next);
if (off != 0)
{
if (off > sbm_sz
|| sbm_sz - off < 2 * sbm_len)
- goto err;
+ goto err_free_buf;
/* Read the 'next' array. */
sbmdesc->next = (unsigned short *) bfd_alloc (abfd, 2 * sbm_len);
buf1 = (bfd_byte *) sbm + off;
--
Alan Modra
Australia Development Lab, IBM
reply other threads:[~2020-02-28 2: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=20200228025713.GK32593@bubble.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).