From patchwork Fri Oct 12 21:10:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Roth X-Patchwork-Id: 191243 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 8ACF82C008B for ; Sat, 13 Oct 2012 09:30:04 +1100 (EST) Received: from localhost ([::1]:39274 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMmXS-00088x-7V for incoming@patchwork.ozlabs.org; Fri, 12 Oct 2012 17:12:58 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42455) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TMmWG-0005xT-LR for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TMmW9-0005zC-Ee for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:44 -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 1TMmW9-0005iK-AI for qemu-devel@nongnu.org; Fri, 12 Oct 2012 17:11:37 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so5335456iea.4 for ; Fri, 12 Oct 2012 14:11:37 -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=ounYmH34J8q1FfdHXEJVpJOFa6uDhb/+nMGzuRJTlYOSwPpLA0GBR5K5D9dj7HjAF/ edduUvDPMkkUvaxVY8mP9MLAON8KmxtjpswUkf37YUNO7cdpX/fD24yJICISZrZsG7Pr 9cfgAWA9jP1L8k307ROTFnc+U6h1gSkaOOtAzrCX66c+yqiKTRWfiHTN9XhTkNboAcza zLPUVzAf8qV6v787IksGcLzBBdr1rGwplavDsAMBNyUC2/1wAwhriD96gGoYtEhEi9mB vj0MeLYppfdVugY48bWTBht/3lpCfuq6R5Zp42advy4PllKVLufpiYmKVeGNO+opMxGY EJSA== Received: by 10.50.36.169 with SMTP id r9mr3268758igj.67.1350076297150; Fri, 12 Oct 2012 14:11:37 -0700 (PDT) Received: from loki.morrigu.org (cpe-72-179-62-111.austin.res.rr.com. [72.179.62.111]) by mx.google.com with ESMTPS id uj11sm2454777igb.15.2012.10.12.14.11.35 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 12 Oct 2012 14:11:36 -0700 (PDT) From: Michael Roth To: qemu-devel@nongnu.org Date: Fri, 12 Oct 2012 16:10:53 -0500 Message-Id: <1350076268-18461-12-git-send-email-mdroth@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 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> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.223.173 Cc: kwolf@redhat.com, peter.maydell@linaro.org, aliguori@us.ibm.com, blauwirbel@gmail.com, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v4 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 } }");