From: Nick Alcock <nick.alcock@oracle.com>
To: binutils@sourceware.org
Subject: [PATCH 3/7] libctf: ctf_archive_iter: fix tiny leak
Date: Fri, 26 Apr 2024 21:20:19 +0100 [thread overview]
Message-ID: <20240426202023.423064-4-nick.alcock@oracle.com> (raw)
In-Reply-To: <20240426202023.423064-1-nick.alcock@oracle.com>
If iteration fails because opening a dict has failed, ctf_archive_next does
not destroy the iterator, so the caller can keep going and try to open other
dicts further into the archive. ctf_archive_iter just returns, though, so
it should free the iterator rather than leaking it.
libctf/
* ctf-archive.c (ctf_archive_iter): Don't leak the iterator on
failure.
---
libctf/ctf-archive.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/libctf/ctf-archive.c b/libctf/ctf-archive.c
index 451d6c69735..f459c02e702 100644
--- a/libctf/ctf-archive.c
+++ b/libctf/ctf-archive.c
@@ -1063,7 +1063,7 @@ ctf_archive_iter (const ctf_archive_t *arc, ctf_archive_member_f *func,
ctf_next_t *i = NULL;
ctf_dict_t *fp;
const char *name;
- int err;
+ int err = 0;
while ((fp = ctf_archive_next (arc, &i, &name, 0, &err)) != NULL)
{
@@ -1077,6 +1077,11 @@ ctf_archive_iter (const ctf_archive_t *arc, ctf_archive_member_f *func,
}
ctf_dict_close (fp);
}
+ if (err != ECTF_NEXT_END && err != 0)
+ {
+ ctf_next_destroy (i);
+ return -1;
+ }
return 0;
}
--
2.44.0.273.ge0bd14271f
next prev parent reply other threads:[~2024-04-26 20:20 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-26 20:20 [PATCH 0/7] libctf: leak-adjacent fixes Nick Alcock
2024-04-26 20:20 ` [PATCH 1/7] libctf: typos Nick Alcock
2024-04-26 20:20 ` [PATCH 2/7] libctf: failure to open parent dicts that exist should be an error Nick Alcock
2024-04-26 20:20 ` Nick Alcock [this message]
2024-04-26 20:20 ` [PATCH 4/7] libctf: test: add lookup_link Nick Alcock
2024-04-26 20:20 ` [PATCH 5/7] libctf: test: add host Nick Alcock
2024-04-26 20:20 ` [PATCH 6/7] libctf: test: add wrapper Nick Alcock
2024-04-26 20:20 ` [PATCH 7/7] libctf: fix leak of entire dict when dict opening fails Nick Alcock
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=20240426202023.423064-4-nick.alcock@oracle.com \
--to=nick.alcock@oracle.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).