From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b3FmC-0002Yq-M3 for qemu-devel@nongnu.org; Thu, 19 May 2016 00:41:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b3FmA-00056H-O8 for qemu-devel@nongnu.org; Thu, 19 May 2016 00:41:35 -0400 From: Eric Blake Date: Wed, 18 May 2016 22:40:49 -0600 Message-Id: <1463632874-28559-4-git-send-email-eblake@redhat.com> In-Reply-To: <1463632874-28559-1-git-send-email-eblake@redhat.com> References: <1463632874-28559-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v4 03/28] qemu-img: Don't leak errors when outputting JSON List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: armbru@redhat.com, Kevin Wolf , Max Reitz , "open list:Block layer core" If our JSON output ever encounters an error, we would just silently leak the local variable. Instead, assert that our usage won't fail. Signed-off-by: Eric Blake --- v4: new patch (split out from v3 14/18) --- qemu-img.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/qemu-img.c b/qemu-img.c index b4f93ce..3aa7fb3 100644 --- a/qemu-img.c +++ b/qemu-img.c @@ -479,12 +479,11 @@ fail: static void dump_json_image_check(ImageCheck *check, bool quiet) { - Error *local_err = NULL; QString *str; QmpOutputVisitor *ov = qmp_output_visitor_new(); QObject *obj; visit_type_ImageCheck(qmp_output_get_visitor(ov), NULL, &check, - &local_err); + &error_abort); obj = qmp_output_get_qobject(ov); str = qobject_to_json_pretty(obj); assert(str != NULL); @@ -2170,12 +2169,11 @@ static void dump_snapshots(BlockDriverState *bs) static void dump_json_image_info_list(ImageInfoList *list) { - Error *local_err = NULL; QString *str; QmpOutputVisitor *ov = qmp_output_visitor_new(); QObject *obj; visit_type_ImageInfoList(qmp_output_get_visitor(ov), NULL, &list, - &local_err); + &error_abort); obj = qmp_output_get_qobject(ov); str = qobject_to_json_pretty(obj); assert(str != NULL); @@ -2187,11 +2185,11 @@ static void dump_json_image_info_list(ImageInfoList *list) static void dump_json_image_info(ImageInfo *info) { - Error *local_err = NULL; QString *str; QmpOutputVisitor *ov = qmp_output_visitor_new(); QObject *obj; - visit_type_ImageInfo(qmp_output_get_visitor(ov), NULL, &info, &local_err); + visit_type_ImageInfo(qmp_output_get_visitor(ov), NULL, &info, + &error_abort); obj = qmp_output_get_qobject(ov); str = qobject_to_json_pretty(obj); assert(str != NULL); -- 2.5.5