[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/15] qemu-img: Don't leak errors when outputting JS
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 02/15] qemu-img: Don't leak errors when outputting JSON |
Date: |
Wed, 6 Jul 2016 11:13:53 +0200 |
From: Eric Blake <address@hidden>
If our JSON output ever encounters an error, we would just silently
leak the error object. Instead, assert that our usage won't fail.
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
qemu-img.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/qemu-img.c b/qemu-img.c
index 3322a1e..debd7f1 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -490,12 +490,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);
@@ -2181,12 +2180,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);
@@ -2198,11 +2196,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
- [Qemu-devel] [PULL 00/15] QAPI patches for 2016-07-06, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 02/15] qemu-img: Don't leak errors when outputting JSON,
Markus Armbruster <=
- [Qemu-devel] [PULL 01/15] qapi: Improve use of qmp/types.h, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 08/15] string-output-visitor: Favor new visit_free() function, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 05/15] opts-visitor: Favor new visit_free() function, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 06/15] string-input-visitor: Favor new visit_free() function, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 15/15] replay: Use new QAPI cloning, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 14/15] sockets: Use new QAPI cloning, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 07/15] qmp-input-visitor: Favor new visit_free() function, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 11/15] tests: Factor out common code in qapi output tests, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 10/15] tests: Clean up test-string-output-visitor, Markus Armbruster, 2016/07/06
- [Qemu-devel] [PULL 09/15] qmp-output-visitor: Favor new visit_free() function, Markus Armbruster, 2016/07/06