From: Eric Blake <eblake@redhat.com>
Date: Wed, 14 Oct 2015 22:30:25 +0000 (-0600)
Subject: qapi: Fix regression with '-netdev help'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d08ac81a459258ce20b3184fa9325c6c1350ac9e;p=qemu.git

qapi: Fix regression with '-netdev help'

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 <marcandre.lureau@gmail.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1444861825-19256-1-git-send-email-eblake@redhat.com>
[Commit message tweaked to say 'help' instead of '?']
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---

diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 4f97781348..d7f51ee250 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);