From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36906) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeExw-0005xz-7v for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XeExo-0004fc-1y for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:32 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49298 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XeExn-0004fB-SW for qemu-devel@nongnu.org; Tue, 14 Oct 2014 23:09:23 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 15 Oct 2014 05:08:38 +0200 Message-Id: <1413342561-4754-5-git-send-email-afaerber@suse.de> In-Reply-To: <1413342561-4754-1-git-send-email-afaerber@suse.de> References: <1413342561-4754-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 04/47] qom: Add error handler for object_property_print() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gonglei , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori From: Gonglei Avoid the caller of object_property_print() leaking string argument's memory, such as qdev_print_props() when encounter errors. Reviewed-by: Paolo Bonzini Signed-off-by: Gonglei Signed-off-by: Andreas F=C3=A4rber --- qom/object.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/qom/object.c b/qom/object.c index da0919a..21135e1 100644 --- a/qom/object.c +++ b/qom/object.c @@ -1010,11 +1010,19 @@ char *object_property_print(Object *obj, const ch= ar *name, bool human, Error **errp) { StringOutputVisitor *mo; - char *string; + char *string =3D NULL; + Error *local_err =3D NULL; =20 mo =3D 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 =3D string_output_get_string(mo); + +out: string_output_visitor_cleanup(mo); return string; } --=20 1.8.4.5