From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:42376) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMmWC-0005jc-8V for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMmWB-000602-9Q for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:40 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:36593) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMmWB-0005iK-4O for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:39 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so5335456iea.4 for ; Fri, 12 Oct 2012 14:11:38 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Fri, 12 Oct 2012 16:10:54 -0500 Message-Id: <1350076268-18461-13-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1350076268-18461-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1350076268-18461-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v4 12/26] qapi: fix potential segfault for visit_type_size() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com visit_type_size() was added for use-cases currently only encountered by OptsVisitor users, which implements a specific handler for visit_type_size(). For Visitor implementations that don't implement the handler, we fallback to using v->type_uint64(). However, some visitor implementations, such as Qmp*Visitor, also rely on fallback code to handle visit_type_uint64() calls, and leave v->type_uint64 unset. This leads to a segfault when we try to use visit_type_size(). Fix this by calling the visit_type_uint64() function in visit_type_size()'s fallback instead of calling v->type_uint64() directly. Signed-off-by: Michael Roth --- qapi/qapi-visit-core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 9a74ed0..dd28cb9 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -237,7 +237,11 @@ void visit_type_int64(Visitor *v, int64_t *obj, const char *name, Error **errp) void visit_type_size(Visitor *v, uint64_t *obj, const char *name, Error **errp) { if (!error_is_set(errp)) { - (v->type_size ? v->type_size : v->type_uint64)(v, obj, name, errp); + if (v->type_size) { + v->type_size(v, obj, name, errp); + } else { + visit_type_uint64(v, obj, name, errp); + } } } -- 1.7.9.5