Patchwork Fix memory leak in cp-support.c (cp_canonicalize_string)

login
register
mail settings
Submitter Alex Lindsay
Date Aug. 7, 2017, 8:18 p.m.
Message ID <20170807201821.25207-1-alexlindsay239@gmail.com>
Download mbox | patch
Permalink /patch/21958/
State New
Headers show

Comments

Alex Lindsay - Aug. 7, 2017, 8:18 p.m.
Formerly, in cp_canonicalize_string in cp-support.c, the return value of
cp_comp_to_string was never freed, creating a sizable memory leak detectable
with valgrind. This patch fixes the leak. However, a longer term solution
would be to change the return type of cp_comp_to_string to
gdb::unique_xmalloc_ptr<char>.
---
 gdb/ChangeLog    | 5 +++++
 gdb/cp-support.c | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

Patch

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 92c573d76b..e0c43c6185 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@ 
+2017-08-07 Alex Lindsay <alexlindsay239@gmail.com>
+
+	* cp-support.c (cp_canonicalize_string): Free return value of
+	cp_comp_to_string
+
 2017-08-03  Tom Tromey  <tom@tromey.com>
 
 	* utils.c (make_cleanup_freeargv, do_freeargv, gdb_buildargv):
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index df9a563508..ffbfd62ee0 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -566,7 +566,9 @@  cp_canonicalize_string (const char *string)
     return std::string ();
 
   estimated_len = strlen (string) * 2;
-  std::string ret = cp_comp_to_string (info->tree, estimated_len);
+  char *ret_char = cp_comp_to_string (info->tree, estimated_len);
+  std::string ret = ret_char;
+  xfree (ret_char);
 
   if (ret.empty ())
     {