From b255b35feb80ecf096825395e01bccd34ee02b2b Mon Sep 17 00:00:00 2001
From: Nick Alcock <nick.alcock@oracle.com>
Date: Tue, 9 Jun 2020 10:45:07 +0100
Subject: libctf, decl: avoid leaks of the formatted string on error
ctf_decl_sprintf builds up a formatted string in the ctf_decl_t's
cd_buf, but then on error this is hardly ever freed: we assume that
ctf_decl_fini frees it, but it leaks it instead.
Make it free it like any decent ADT should.
libctf/
* ctf-decl.c (ctf_decl_fini): Free the cd_buf.
(ctf_decl_buf): Once it escapes, don't try to free it later.
---
libctf/ctf-decl.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'libctf/ctf-decl.c')
diff --git a/libctf/ctf-decl.c b/libctf/ctf-decl.c
index 5dcf60a..faf421e 100644
--- a/libctf/ctf-decl.c
+++ b/libctf/ctf-decl.c
@@ -68,6 +68,7 @@ ctf_decl_fini (ctf_decl_t *cd)
free (cdp);
}
}
+ free (cd->cd_buf);
}
void
@@ -195,5 +196,7 @@ void ctf_decl_sprintf (ctf_decl_t *cd, const char *format, ...)
char *ctf_decl_buf (ctf_decl_t *cd)
{
- return cd->cd_buf;
+ char *buf = cd->cd_buf;
+ cd->cd_buf = NULL;
+ return buf;
}
--
cgit v1.1