From patchwork Thu Sep 8 14:17:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 9321795 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4CD9C6077F for ; Thu, 8 Sep 2016 16:47:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 41C9A29912 for ; Thu, 8 Sep 2016 16:47:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3670729913; Thu, 8 Sep 2016 16:47:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 11D6429917 for ; Thu, 8 Sep 2016 16:47:17 +0000 (UTC) Received: from localhost ([::1]:49232 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi2Ts-0002k0-32 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 08 Sep 2016 12:47:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57646) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi0AC-0001j7-Jm for qemu-devel@nongnu.org; Thu, 08 Sep 2016 10:18:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bi0AA-0000vX-BF for qemu-devel@nongnu.org; Thu, 08 Sep 2016 10:18:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50956) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bi0AA-0000vE-3L for qemu-devel@nongnu.org; Thu, 08 Sep 2016 10:18:46 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B27863B3C2; Thu, 8 Sep 2016 14:18:45 +0000 (UTC) Received: from localhost (ovpn-116-47.phx2.redhat.com [10.3.116.47]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u88EIhVU022416; Thu, 8 Sep 2016 10:18:44 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= To: qemu-devel@nongnu.org Date: Thu, 8 Sep 2016 18:17:18 +0400 Message-Id: <20160908141720.30641-24-marcandre.lureau@redhat.com> In-Reply-To: <20160908141720.30641-1-marcandre.lureau@redhat.com> References: <20160908141720.30641-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 08 Sep 2016 14:18:45 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULLv2 23/25] tests: pc-cpu-test leaks fixes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, armbru@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , pbonzini@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The path is allocated and should be freed. The qmp response should be unref, but then 'machine' must be duplicated. Use a destroy function for the PCTestData. Signed-off-by: Marc-André Lureau Reviewed-by: Eric Blake --- tests/pc-cpu-test.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/tests/pc-cpu-test.c b/tests/pc-cpu-test.c index 4428cea..c3a2633 100644 --- a/tests/pc-cpu-test.c +++ b/tests/pc-cpu-test.c @@ -14,7 +14,7 @@ #include "qapi/qmp/types.h" struct PCTestData { - const char *machine; + char *machine; const char *cpu_model; unsigned sockets; unsigned cores; @@ -71,6 +71,14 @@ static void test_pc_without_cpu_add(gconstpointer data) g_free(args); } +static void test_data_free(gpointer data) +{ + PCTestData *pc = data; + + g_free(pc->machine); + g_free(pc); +} + static void add_pc_test_cases(void) { QDict *response, *minfo; @@ -78,7 +86,8 @@ static void add_pc_test_cases(void) const QListEntry *p; QObject *qobj; QString *qstr; - const char *mname, *path; + const char *mname; + char *path; PCTestData *data; qtest_start("-machine none"); @@ -99,7 +108,7 @@ static void add_pc_test_cases(void) continue; } data = g_malloc(sizeof(PCTestData)); - data->machine = mname; + data->machine = g_strdup(mname); data->cpu_model = "Haswell"; /* 1.3+ theoretically */ data->sockets = 1; data->cores = 3; @@ -119,14 +128,19 @@ static void add_pc_test_cases(void) path = g_strdup_printf("cpu/%s/init/%ux%ux%u&maxcpus=%u", mname, data->sockets, data->cores, data->threads, data->maxcpus); - qtest_add_data_func(path, data, test_pc_without_cpu_add); + qtest_add_data_func_full(path, data, test_pc_without_cpu_add, + test_data_free); + g_free(path); } else { path = g_strdup_printf("cpu/%s/add/%ux%ux%u&maxcpus=%u", mname, data->sockets, data->cores, data->threads, data->maxcpus); - qtest_add_data_func(path, data, test_pc_with_cpu_add); + qtest_add_data_func_full(path, data, test_pc_with_cpu_add, + test_data_free); + g_free(path); } } + QDECREF(response); qtest_end(); }