diff mbox series

[3/7] libctf: ctf_archive_iter: fix tiny leak

Message ID 20240426202023.423064-4-nick.alcock@oracle.com
State New
Headers
Series libctf: leak-adjacent fixes |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_binutils_build--master-arm success Testing passed
linaro-tcwg-bot/tcwg_binutils_build--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-aarch64 success Testing passed
linaro-tcwg-bot/tcwg_binutils_check--master-arm success Testing passed

Commit Message

Nick Alcock April 26, 2024, 8:20 p.m. UTC 
  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 mbox series

Patch

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;
 }