From: Simon Marchi <simon.marchi@ericsson.com>
To: <gdb-patches@sourceware.org>
Cc: Simon Marchi <simon.marchi@ericsson.com>
Subject: [PATCH] Free results of varobj_get_type and type_to_string
Date: Tue, 27 Jan 2015 22:48:00 -0000 [thread overview]
Message-ID: <1422383618-8215-1-git-send-email-simon.marchi@ericsson.com> (raw)
varobj_get_type and type_to_string return an allocated string, which is
not freed at a couple of places.
gdb/ChangeLog:
* mi/mi-cmd-var.c (mi_cmd_var_info_type): Free result of
varobj_get_type.
(varobj_update_one): Same.
* varobj.c (update_type_if_necessary): Free curr_type_str and
new_type_str.
(varobj_get_type): Specify in comment that the result needs to be
freed by the caller.
---
gdb/mi/mi-cmd-var.c | 12 ++++++++++--
gdb/varobj.c | 5 ++++-
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index 01838b1..4aabb57 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -447,14 +447,18 @@ mi_cmd_var_info_type (char *command, char **argv, int argc)
{
struct ui_out *uiout = current_uiout;
struct varobj *var;
+ char *type;
if (argc != 1)
error (_("-var-info-type: Usage: NAME."));
/* Get varobj handle, if a valid var obj name was specified. */
var = varobj_get_handle (argv[0]);
+ type = varobj_get_type (var);
+
+ ui_out_field_string (uiout, "type", type);
- ui_out_field_string (uiout, "type", varobj_get_type (var));
+ xfree (type);
}
void
@@ -765,7 +769,11 @@ varobj_update_one (struct varobj *var, enum print_values print_values,
}
if (r->type_changed)
- ui_out_field_string (uiout, "new_type", varobj_get_type (r->varobj));
+ {
+ char *type = varobj_get_type (r->varobj);
+ ui_out_field_string (uiout, "new_type", type);
+ xfree (type);
+ }
if (r->type_changed || r->children_changed)
ui_out_field_int (uiout, "new_num_children",
diff --git a/gdb/varobj.c b/gdb/varobj.c
index a10560f..9735958 100644
--- a/gdb/varobj.c
+++ b/gdb/varobj.c
@@ -972,7 +972,8 @@ varobj_add_child (struct varobj *var, struct varobj_item *item)
}
/* Obtain the type of an object Variable as a string similar to the one gdb
- prints on the console. */
+ prints on the console. The caller is responsible for freeing the string.
+ */
char *
varobj_get_type (struct varobj *var)
@@ -1303,6 +1304,8 @@ update_type_if_necessary (struct varobj *var, struct value *new_value)
var->num_children = -1;
return 1;
}
+ xfree (curr_type_str);
+ xfree (new_type_str);
}
}
--
1.9.1
next reply other threads:[~2015-01-27 18:33 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-27 22:48 Simon Marchi [this message]
2015-01-29 7:38 ` Joel Brobecker
2015-01-29 16:28 ` Simon Marchi
2015-01-30 19:46 ` Joel Brobecker
2015-01-30 20:17 ` Simon Marchi
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=1422383618-8215-1-git-send-email-simon.marchi@ericsson.com \
--to=simon.marchi@ericsson.com \
--cc=gdb-patches@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).