OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Free results of varobj_get_type and type_to_string 

varobj_get_type and type_to_string return an allocated string, which is
not freed at a couple of places.

New in v2:
 * Rename char * type to type_name.
 * Free in all cases in update_type_if_necessary.

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.
This commit is contained in:
Simon Marchi 2015-01-30 13:54:50 -05:00
parent 9fc1d6863b
commit afa269ae41
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gdb/ChangeLog
View File

@ -1,3 +1,13 @@
2015-01-30 Simon Marchi <simon.marchi@ericsson.com>
* 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.
2015-01-29 Doug Evans <dje@google.com> 2015-01-29 Doug Evans <dje@google.com>
PR symtab/17890 PR symtab/17890

13
gdb/mi/mi-cmd-var.c
View File

@ -447,14 +447,18 @@ mi_cmd_var_info_type (char *command, char **argv, int argc)
{ {
struct ui_out *uiout = current_uiout; struct ui_out *uiout = current_uiout;
struct varobj *var; struct varobj *var;
char *type_name;
if (argc != 1) if (argc != 1)
error (_("-var-info-type: Usage: NAME.")); error (_("-var-info-type: Usage: NAME."));
/* Get varobj handle, if a valid var obj name was specified. */ /* Get varobj handle, if a valid var obj name was specified. */
var = varobj_get_handle (argv[0]); var = varobj_get_handle (argv[0]);
type_name = varobj_get_type (var);
ui_out_field_string (uiout, "type", varobj_get_type (var)); ui_out_field_string (uiout, "type", type_name);
xfree (type_name);
} }
void void
@ -765,7 +769,12 @@ varobj_update_one (struct varobj *var, enum print_values print_values,
} }
if (r->type_changed) if (r->type_changed)
ui_out_field_string (uiout, "new_type", varobj_get_type (r->varobj)); {
char *type_name = varobj_get_type (r->varobj);
ui_out_field_string (uiout, "new_type", type_name);
xfree (type_name);
}
if (r->type_changed || r->children_changed) if (r->type_changed || r->children_changed)
ui_out_field_int (uiout, "new_num_children", ui_out_field_int (uiout, "new_num_children",

10
gdb/varobj.c
View File

@ -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 /* 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 * char *
varobj_get_type (struct varobj *var) varobj_get_type (struct varobj *var)
@ -1289,11 +1290,16 @@ update_type_if_necessary (struct varobj *var, struct value *new_value)
{ {
struct type *new_type; struct type *new_type;
char *curr_type_str, *new_type_str; char *curr_type_str, *new_type_str;
int type_name_changed;
new_type = value_actual_type (new_value, 0, 0); new_type = value_actual_type (new_value, 0, 0);
new_type_str = type_to_string (new_type); new_type_str = type_to_string (new_type);
curr_type_str = varobj_get_type (var); curr_type_str = varobj_get_type (var);
if (strcmp (curr_type_str, new_type_str) != 0) type_name_changed = strcmp (curr_type_str, new_type_str) != 0;
xfree (curr_type_str);
xfree (new_type_str);
if (type_name_changed)
{ {
var->type = new_type; var->type = new_type;