From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmOwy-0002if-IM for qemu-devel@nongnu.org; Wed, 14 Oct 2015 12:30:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZmOwv-00083P-AV for qemu-devel@nongnu.org; Wed, 14 Oct 2015 12:30:48 -0400 Received: from resqmta-po-03v.sys.comcast.net ([96.114.154.162]:48297) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZmOwv-000836-0r for qemu-devel@nongnu.org; Wed, 14 Oct 2015 12:30:45 -0400 From: Eric Blake Date: Wed, 14 Oct 2015 10:30:29 -0600 Message-Id: <1444840229-26171-1-git-send-email-eblake@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH] qapi: Fix regression with '-netdev ?' List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcandre.lureau@gmail.com, armbru@redhat.com, Michael Roth Commit e36c714e causes 'qemu -netdev ?' to dump core, because the call to visit_end_union() is no longer conditional on whether *obj was allocated. Reported by Marc-André Lureau Signed-off-by: Eric Blake --- 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 9e99c3a..74748a2 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -297,7 +297,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)->u.data, &err); + if (*obj) { + visit_end_union(v, !!(*obj)->u.data, &err); + } error_propagate(errp, err); err = NULL; visit_end_struct(v, &err); -- 2.4.3