From nobody Tue May 7 09:01:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1524489392081440.27181898269635; Mon, 23 Apr 2018 06:16:32 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7FE2E81E09; Mon, 23 Apr 2018 13:16:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4114A5E1A0; Mon, 23 Apr 2018 13:16:30 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id BAA2465D2B; Mon, 23 Apr 2018 13:16:29 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w3NDGRVp022891 for ; Mon, 23 Apr 2018 09:16:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6547B1102E2A; Mon, 23 Apr 2018 13:16:27 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id 091C51208F70 for ; Mon, 23 Apr 2018 13:16:24 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 23 Apr 2018 15:16:24 +0200 Message-Id: <3d41308e27fa3e20c3f8c62e336d48d91547ecbc.1524489336.git.phrdina@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH] domain: fix virTypedParameter memory leaks X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 23 Apr 2018 13:16:31 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" virTypedParameter can contain string which needs to be freed. Signed-off-by: Pavel Hrdina Reviewed-by: Katerina Koukiou --- src/domain.c | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/src/domain.c b/src/domain.c index 50382ee..488760b 100644 --- a/src/domain.c +++ b/src/domain.c @@ -841,8 +841,7 @@ virtDBusDomainGetBlkioParameters(GVariant *inArgs, { virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; - g_autofree virTypedParameterPtr params =3D NULL; - gint nparams =3D 0; + g_auto(virtDBusUtilTypedParams) params =3D { 0 }; guint flags; gint ret; GVariant *grecords; @@ -853,14 +852,16 @@ virtDBusDomainGetBlkioParameters(GVariant *inArgs, if (!domain) return; =20 - ret =3D virDomainGetBlkioParameters(domain, NULL, &nparams, flags); - if (ret =3D=3D 0 && nparams !=3D 0) { - params =3D g_new0(virTypedParameter, nparams); - if (virDomainGetBlkioParameters(domain, params, &nparams, flags) <= 0) + ret =3D virDomainGetBlkioParameters(domain, NULL, ¶ms.nparams, fla= gs); + if (ret =3D=3D 0 && params.nparams !=3D 0) { + params.params =3D g_new0(virTypedParameter, params.nparams); + if (virDomainGetBlkioParameters(domain, params.params, + ¶ms.nparams, flags) < 0) { return virtDBusUtilSetLastVirtError(error); + } } =20 - grecords =3D virtDBusUtilTypedParamsToGVariant(params, nparams); + grecords =3D virtDBusUtilTypedParamsToGVariant(params.params, params.n= params); =20 *outArgs =3D g_variant_new_tuple(&grecords, 1); } @@ -958,8 +959,7 @@ virtDBusDomainGetMemoryParameters(GVariant *inArgs, { virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; - g_autofree virTypedParameterPtr params =3D NULL; - gint nparams =3D 0; + g_auto(virtDBusUtilTypedParams) params =3D { 0 }; guint flags; gint ret; GVariant *grecords; @@ -970,14 +970,16 @@ virtDBusDomainGetMemoryParameters(GVariant *inArgs, if (!domain) return; =20 - ret =3D virDomainGetMemoryParameters(domain, NULL, &nparams, flags); - if (ret =3D=3D 0 && nparams !=3D 0) { - params =3D g_new0(virTypedParameter, nparams); - if (virDomainGetMemoryParameters(domain, params, &nparams, flags) = < 0) + ret =3D virDomainGetMemoryParameters(domain, NULL, ¶ms.nparams, fl= ags); + if (ret =3D=3D 0 && params.nparams !=3D 0) { + params.params =3D g_new0(virTypedParameter, params.nparams); + if (virDomainGetMemoryParameters(domain, params.params, + ¶ms.nparams, flags) < 0) { return virtDBusUtilSetLastVirtError(error); + } } =20 - grecords =3D virtDBusUtilTypedParamsToGVariant(params, nparams); + grecords =3D virtDBusUtilTypedParamsToGVariant(params.params, params.n= params); =20 *outArgs =3D g_variant_new_tuple(&grecords, 1); } @@ -993,8 +995,7 @@ virtDBusDomainGetSchedulerParameters(GVariant *inArgs, { virtDBusConnect *connect =3D userData; g_autoptr(virDomain) domain =3D NULL; - g_autofree virTypedParameterPtr params =3D NULL; - gint nparams; + g_auto(virtDBusUtilTypedParams) params =3D { 0 }; guint flags; GVariant *grecords; g_autofree gchar *ret =3D NULL; @@ -1005,14 +1006,15 @@ virtDBusDomainGetSchedulerParameters(GVariant *inAr= gs, if (!domain) return; =20 - ret =3D virDomainGetSchedulerType(domain, &nparams); - if (ret && nparams !=3D 0) { - params =3D g_new0(virTypedParameter, nparams); - if (virDomainGetSchedulerParametersFlags(domain, params, &nparams,= 0)) + ret =3D virDomainGetSchedulerType(domain, ¶ms.nparams); + if (ret && params.nparams !=3D 0) { + params.params =3D g_new0(virTypedParameter, params.nparams); + if (virDomainGetSchedulerParametersFlags(domain, params.params, + ¶ms.nparams, 0)) return virtDBusUtilSetLastVirtError(error); } =20 - grecords =3D virtDBusUtilTypedParamsToGVariant(params, nparams); + grecords =3D virtDBusUtilTypedParamsToGVariant(params.params, params.n= params); =20 *outArgs =3D g_variant_new_tuple(&grecords, 1); } --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list