From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:34726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTgu2-0000xB-0N for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTgu0-0005p8-Kg for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:49 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:33189) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTgu0-0005k6-GX for qemu-devel@nongnu.org; Wed, 31 Oct 2012 18:36:48 -0400 Received: by mail-ie0-f173.google.com with SMTP id 17so2893446iea.4 for ; Wed, 31 Oct 2012 15:36:48 -0700 (PDT) Sender: fluxion From: Michael Roth Date: Wed, 31 Oct 2012 17:35:56 -0500 Message-Id: <1351722972-17801-13-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1351722972-17801-1-git-send-email-mdroth@linux.vnet.ibm.com> References: <1351722972-17801-1-git-send-email-mdroth@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 12/28] qapi: QmpInputVisitor, don't re-allocate memory in start_struct 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 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 } }"); -- 1.7.9.5