From nobody Sat Apr 27 16:03:00 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 1524147052965744.8215703176818; Thu, 19 Apr 2018 07:10:52 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3C25A313064A; Thu, 19 Apr 2018 14:10:51 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A2A1B84ACD; Thu, 19 Apr 2018 14:10:50 +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 EA35D1805972; Thu, 19 Apr 2018 14:10:48 +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 w3JE9gLv004876 for ; Thu, 19 Apr 2018 10:09:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id D7A7010F1BFA; Thu, 19 Apr 2018 14:09:42 +0000 (UTC) Received: from katerina.brq.redhat.com (unknown [10.43.2.14]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7BF7C10FFE6A for ; Thu, 19 Apr 2018 14:09:40 +0000 (UTC) From: Katerina Koukiou To: libvir-list@redhat.com Date: Thu, 19 Apr 2018 16:09:38 +0200 Message-Id: <20180419140938.12960-1-kkoukiou@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH] Fix memory leaks introduced by commits 40dc3b and 408a25 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Thu, 19 Apr 2018 14:10:52 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Katerina Koukiou Reviewed-by: Pavel Hrdina --- src/domain.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/domain.c b/src/domain.c index 6c44377..ae1b68f 100644 --- a/src/domain.c +++ b/src/domain.c @@ -506,7 +506,7 @@ virtDBusDomainBlockPeek(GVariant *inArgs, gsize size; guint flags; g_autofree guchar *buffer =3D NULL; - GVariantBuilder *builder; + GVariantBuilder builder; GVariant *res; =20 g_variant_get(inArgs, "(&sttu)", &disk, &offset, &size, &flags); @@ -519,11 +519,11 @@ virtDBusDomainBlockPeek(GVariant *inArgs, if (virDomainBlockPeek(domain, disk, offset, size, buffer, flags) < 0) return virtDBusUtilSetLastVirtError(error); =20 - builder =3D g_variant_builder_new(G_VARIANT_TYPE("ay")); + g_variant_builder_init(&builder, G_VARIANT_TYPE("ay")); for (unsigned int i =3D 0; i < size; i++) - g_variant_builder_add(builder, "y", buffer[i]); + g_variant_builder_add(&builder, "y", buffer[i]); =20 - res =3D g_variant_builder_end(builder); + res =3D g_variant_builder_end(&builder); =20 *outArgs =3D g_variant_new_tuple(&res, 1); } @@ -1221,7 +1221,7 @@ virtDBusDomainMemoryPeek(GVariant *inArgs, gsize size; guint flags; g_autofree guchar *buffer =3D NULL; - GVariantBuilder *builder; + GVariantBuilder builder; GVariant *res; =20 g_variant_get(inArgs, "(ttu)", &offset, &size, &flags); @@ -1234,11 +1234,11 @@ virtDBusDomainMemoryPeek(GVariant *inArgs, if (virDomainMemoryPeek(domain, offset, size, buffer, flags) < 0) return virtDBusUtilSetLastVirtError(error); =20 - builder =3D g_variant_builder_new(G_VARIANT_TYPE("ay")); + g_variant_builder_init(&builder, G_VARIANT_TYPE("ay")); for (unsigned int i =3D 0; i < size; i++) - g_variant_builder_add(builder, "y", buffer[i]); + g_variant_builder_add(&builder, "y", buffer[i]); =20 - res =3D g_variant_builder_end(builder); + res =3D g_variant_builder_end(&builder); =20 *outArgs =3D g_variant_new_tuple(&res, 1); } --=20 2.15.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list