mirror of https://github.com/proxmox/mirror_qemu
qom/object.c, hmp.c: fix string_output_get_string() memory leak
string_output_get_string() uses g_string_free(str, false) to transfer the 'str' pointer to callers and never free it. Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Reviewed-by: Hu Tao <hutao@cn.fujitsu.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>master
parent
b0e90181e4
commit
976620ac40
6
hmp.c
6
hmp.c
|
@ -1687,6 +1687,7 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
|
||||||
MemdevList *memdev_list = qmp_query_memdev(&err);
|
MemdevList *memdev_list = qmp_query_memdev(&err);
|
||||||
MemdevList *m = memdev_list;
|
MemdevList *m = memdev_list;
|
||||||
StringOutputVisitor *ov;
|
StringOutputVisitor *ov;
|
||||||
|
char *str;
|
||||||
int i = 0;
|
int i = 0;
|
||||||
|
|
||||||
|
|
||||||
|
@ -1704,9 +1705,10 @@ void hmp_info_memdev(Monitor *mon, const QDict *qdict)
|
||||||
m->value->prealloc ? "true" : "false");
|
m->value->prealloc ? "true" : "false");
|
||||||
monitor_printf(mon, " policy: %s\n",
|
monitor_printf(mon, " policy: %s\n",
|
||||||
HostMemPolicy_lookup[m->value->policy]);
|
HostMemPolicy_lookup[m->value->policy]);
|
||||||
monitor_printf(mon, " host nodes: %s\n",
|
str = string_output_get_string(ov);
|
||||||
string_output_get_string(ov));
|
monitor_printf(mon, " host nodes: %s\n", str);
|
||||||
|
|
||||||
|
g_free(str);
|
||||||
string_output_visitor_cleanup(ov);
|
string_output_visitor_cleanup(ov);
|
||||||
m = m->next;
|
m = m->next;
|
||||||
i++;
|
i++;
|
||||||
|
|
12
qom/object.c
12
qom/object.c
|
@ -938,14 +938,18 @@ int object_property_get_enum(Object *obj, const char *name,
|
||||||
{
|
{
|
||||||
StringOutputVisitor *sov;
|
StringOutputVisitor *sov;
|
||||||
StringInputVisitor *siv;
|
StringInputVisitor *siv;
|
||||||
|
char *str;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
sov = string_output_visitor_new(false);
|
sov = string_output_visitor_new(false);
|
||||||
object_property_get(obj, string_output_get_visitor(sov), name, errp);
|
object_property_get(obj, string_output_get_visitor(sov), name, errp);
|
||||||
siv = string_input_visitor_new(string_output_get_string(sov));
|
str = string_output_get_string(sov);
|
||||||
|
siv = string_input_visitor_new(str);
|
||||||
string_output_visitor_cleanup(sov);
|
string_output_visitor_cleanup(sov);
|
||||||
visit_type_enum(string_input_get_visitor(siv),
|
visit_type_enum(string_input_get_visitor(siv),
|
||||||
&ret, strings, NULL, name, errp);
|
&ret, strings, NULL, name, errp);
|
||||||
|
|
||||||
|
g_free(str);
|
||||||
string_input_visitor_cleanup(siv);
|
string_input_visitor_cleanup(siv);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
|
@ -956,13 +960,17 @@ void object_property_get_uint16List(Object *obj, const char *name,
|
||||||
{
|
{
|
||||||
StringOutputVisitor *ov;
|
StringOutputVisitor *ov;
|
||||||
StringInputVisitor *iv;
|
StringInputVisitor *iv;
|
||||||
|
char *str;
|
||||||
|
|
||||||
ov = string_output_visitor_new(false);
|
ov = string_output_visitor_new(false);
|
||||||
object_property_get(obj, string_output_get_visitor(ov),
|
object_property_get(obj, string_output_get_visitor(ov),
|
||||||
name, errp);
|
name, errp);
|
||||||
iv = string_input_visitor_new(string_output_get_string(ov));
|
str = string_output_get_string(ov);
|
||||||
|
iv = string_input_visitor_new(str);
|
||||||
visit_type_uint16List(string_input_get_visitor(iv),
|
visit_type_uint16List(string_input_get_visitor(iv),
|
||||||
list, NULL, errp);
|
list, NULL, errp);
|
||||||
|
|
||||||
|
g_free(str);
|
||||||
string_output_visitor_cleanup(ov);
|
string_output_visitor_cleanup(ov);
|
||||||
string_input_visitor_cleanup(iv);
|
string_input_visitor_cleanup(iv);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue