From patchwork Fri Oct 19 02:42:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 192493 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BCD832C007C for ; Fri, 19 Oct 2012 14:07:08 +1100 (EST) Received: from localhost ([::1]:58167 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2Z6-0006gn-0k for incoming@patchwork.ozlabs.org; Thu, 18 Oct 2012 22:44:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42562) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2Xy-0004GS-9b for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TP2Xx-0002oo-1C for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:50 -0400 Received: from mail-oa0-f45.google.com ([209.85.219.45]:49553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TP2Xw-0002dj-J2 for qemu-devel@nongnu.org; Thu, 18 Oct 2012 22:42:48 -0400 Received: by mail-oa0-f45.google.com with SMTP id i18so3273oag.4 for ; Thu, 18 Oct 2012 19:42:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=l/C6aOwRQOGqQak6sm/72qGSvS3/ei2v2P21Zxms5aE=; b=hEmkeK1nOhuRJ5RpGdis90KIk6VWD4KrX1UlwZTbITdGpOBL5IO6c4ylmITosI2aSV FM6EoHhEd0BAhWhm8MiS14GrmbgTJhKH1hGdDPQ+F0XEfAz+phR/Vqis3EHFFzA1NQ9h Umj7+cBD+ys5Yz+lSI5UyrPIr7WcLEfdytiFshSgRah1khE8SMUmdIMV/NU7zW6q2I6p /57q/oe9OwgR6D1F6y4Xw0trWhEvtQKyLupRTJqMyuehzn13WyTHwFsf1yDnZfS2Rp0d PrtkuyNH/FaTtV0MgiDgwUYJ01t8m0dThosk0kfIN0xVO3DFNLA0fCBjzHxZxJdoi8f4 XhUw== Received: by 10.60.172.177 with SMTP id bd17mr4391871oec.101.1350614568282; Thu, 18 Oct 2012 19:42:48 -0700 (PDT) Received: from loki.austin.ibm.com ([32.97.110.59]) by mx.google.com with ESMTPS id m6sm475144obk.3.2012.10.18.19.42.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 18 Oct 2012 19:42:47 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2012 21:42:05 -0500 Message-Id: <1350614540-28583-12-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1350614540-28583-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1350614540-28583-1-git-send-email-mdroth@linux.vnet.ibm.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.219.45 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH 11/26] qapi: QmpInputVisitor, don't re-allocate memory in start_struct X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org If we're given a pointer that has already be initialized to a non-NULL value, don't attempt to allocate memory for the object as we'll likely clobber something we weren't supposed to. Also, fix up a check in the unit test that may fail as a result of this change do to it not initializing the object to NULL before-hand and thus depending on this behavior to clobber a potentially garbage ptr value. This is needed to handle embedded/non-pointer struct fields. Signed-off-by: Michael Roth --- qapi/qmp-input-visitor.c | 2 +- tests/test-qmp-input-visitor.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c index 635106e..c4388f3 100644 --- a/qapi/qmp-input-visitor.c +++ b/qapi/qmp-input-visitor.c @@ -132,7 +132,7 @@ static void qmp_input_start_struct(Visitor *v, void **obj, const char *kind, return; } - if (obj) { + if (obj && *obj == NULL) { *obj = g_malloc0(size); } } diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c index 8f5a509..58e04f1 100644 --- a/tests/test-qmp-input-visitor.c +++ b/tests/test-qmp-input-visitor.c @@ -247,7 +247,7 @@ static void test_visitor_in_union(TestInputVisitorData *data, { Visitor *v; Error *err = NULL; - UserDefUnion *tmp; + UserDefUnion *tmp = NULL; v = visitor_input_test_init(data, "{ 'type': 'b', 'data' : { 'integer': 42 } }");