[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/12] qapi: Fix regression with '-netdev help'
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 01/12] qapi: Fix regression with '-netdev help' |
Date: |
Thu, 15 Oct 2015 09:51:34 +0200 |
From: Eric Blake <address@hidden>
Commit e36c714e causes 'qemu -netdev help' to dump core, because the
call to visit_end_union() is no longer conditional on whether *obj was
allocated.
Reported by Marc-André Lureau <address@hidden>
Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
[Commit message tweaked to say 'help' instead of '?']
Signed-off-by: Markus Armbruster <address@hidden>
---
scripts/qapi-visit.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 4f97781..d7f51ee 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -301,7 +301,9 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj,
const char *name, Error
out_obj:
error_propagate(errp, err);
err = NULL;
- visit_end_union(v, !!(*obj)->data, &err);
+ if (*obj) {
+ visit_end_union(v, !!(*obj)->data, &err);
+ }
error_propagate(errp, err);
err = NULL;
visit_end_struct(v, &err);
--
2.4.3
- [Qemu-devel] [PULL 00/12] QAPI patches, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 01/12] qapi: Fix regression with '-netdev help',
Markus Armbruster <=
- [Qemu-devel] [PULL 04/12] qapi: Drop redundant alternate-good test, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 12/12] qapi: Track location that created an implicit type, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 10/12] qapi: Lazy creation of array types, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 03/12] qapi: Prepare for errors during check(), Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 08/12] qapi: Drop redundant args-member-array test, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 07/12] qapi: Drop redundant flat-union-reverse-define test, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 06/12] qapi: Drop redundant returns-int test, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 09/12] qapi: Don't use info as witness of implicit object type, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 05/12] qapi: Move empty-enum to compile-time test, Markus Armbruster, 2015/10/15
- [Qemu-devel] [PULL 02/12] qapi: Use predicate callback to determine visit filtering, Markus Armbruster, 2015/10/15