mirror of https://github.com/proxmox/mirror_qemu
qom: Add error handler for object_property_print()
Avoid the caller of object_property_print() leaking string argument's memory, such as qdev_print_props() when encounter errors. Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Gonglei <arei.gonglei@huawei.com> Signed-off-by: Andreas Färber <afaerber@suse.de>master
parent
688b057aec
commit
3a53009fa0
12
qom/object.c
12
qom/object.c
|
@ -1010,11 +1010,19 @@ char *object_property_print(Object *obj, const char *name, bool human,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
StringOutputVisitor *mo;
|
StringOutputVisitor *mo;
|
||||||
char *string;
|
char *string = NULL;
|
||||||
|
Error *local_err = NULL;
|
||||||
|
|
||||||
mo = string_output_visitor_new(human);
|
mo = string_output_visitor_new(human);
|
||||||
object_property_get(obj, string_output_get_visitor(mo), name, errp);
|
object_property_get(obj, string_output_get_visitor(mo), name, &local_err);
|
||||||
|
if (local_err) {
|
||||||
|
error_propagate(errp, local_err);
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
|
|
||||||
string = string_output_get_string(mo);
|
string = string_output_get_string(mo);
|
||||||
|
|
||||||
|
out:
|
||||||
string_output_visitor_cleanup(mo);
|
string_output_visitor_cleanup(mo);
|
||||||
return string;
|
return string;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue