From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42026) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAgYG-0002mR-LE for qemu-devel@nongnu.org; Thu, 22 Mar 2012 07:51:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAgYA-0004jl-5Y for qemu-devel@nongnu.org; Thu, 22 Mar 2012 07:51:32 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:52098) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAgY9-0004hi-St for qemu-devel@nongnu.org; Thu, 22 Mar 2012 07:51:26 -0400 Received: by mail-we0-f173.google.com with SMTP id p12so2022424wer.4 for ; Thu, 22 Mar 2012 04:51:24 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 22 Mar 2012 12:51:07 +0100 Message-Id: <1332417072-20329-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1332417072-20329-1-git-send-email-pbonzini@redhat.com> References: <1332417072-20329-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 05/10] qapi: allow freeing partially-allocated objects List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com, eblake@redhat.com, anthony@codemonkey.vs, lcapitulino@redhat.com Objects going through the dealloc visitor can be only partially allocated. Detect the situation and avoid a segfault. This also helps with the input visitor, when there are errors. Signed-off-by: Paolo Bonzini --- scripts/qapi-visit.py | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index b242315..a85fb76 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -65,6 +65,9 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** return; } visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s), errp); + if (obj && !*obj) { + goto end; + } ''', name=name) push_indent() @@ -72,6 +75,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** pop_indent() ret += mcgen(''' +end: visit_end_struct(m, errp); } ''') @@ -122,6 +126,9 @@ void visit_type_%(name)s(Visitor *m, %(name)s ** obj, const char *name, Error ** return; } visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s), &err); + if (obj && !*obj) { + goto end; + } visit_type_%(name)sKind(m, &(*obj)->kind, "type", &err); if (err) { error_propagate(errp, err); -- 1.7.9.1