From nobody Mon Mar 30 00:45:45 2026 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.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1491810853296193.82799568851; Mon, 10 Apr 2017 00:54:13 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9E0C380463; Mon, 10 Apr 2017 07:54:11 +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 73DF199E82; Mon, 10 Apr 2017 07:54:11 +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 2920A18523C8; Mon, 10 Apr 2017 07:54:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id v3A7s5uQ027143 for ; Mon, 10 Apr 2017 03:54:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 21DDDA3A65; Mon, 10 Apr 2017 07:54:05 +0000 (UTC) Received: from antique-work.brq.redhat.com (dhcp129-230.brq.redhat.com [10.34.129.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99FAE78C06 for ; Mon, 10 Apr 2017 07:54:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 9E0C380463 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=libvir-list-bounces@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 9E0C380463 From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 10 Apr 2017 09:53:58 +0200 Message-Id: <4c63aae82aba76f81e059e5029bae836ca7d2b59.1491810803.git.phrdina@redhat.com> In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 2/4] src: fix multiple resource leaks in loops 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.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Mon, 10 Apr 2017 07:54:12 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" All of the variables are filled inside a loop and therefore needs to be also freed in every cycle. Signed-off-by: Pavel Hrdina --- src/conf/node_device_conf.c | 10 +++++----- src/conf/storage_conf.c | 1 + src/util/virsysinfo.c | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 7d0baa9d1a..e21a98d51f 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -1582,7 +1582,6 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, for (i =3D 0, m =3D 0; i < n; i++) { xmlNodePtr node =3D nodes[i]; char *tmp =3D virXMLPropString(node, "type"); - virNodeDevDevnodeType type; int val; =20 if (!tmp) { @@ -1591,15 +1590,16 @@ virNodeDeviceDefParseXML(xmlXPathContextPtr ctxt, goto error; } =20 - if ((val =3D virNodeDevDevnodeTypeFromString(tmp)) < 0) { + val =3D virNodeDevDevnodeTypeFromString(tmp); + VIR_FREE(tmp); + + if (val < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown devnode type '%s'"), tmp); - VIR_FREE(tmp); goto error; } - type =3D val; =20 - switch (type) { + switch ((virNodeDevDevnodeType)val) { case VIR_NODE_DEV_DEVNODE_DEV: def->devnode =3D (char*)xmlNodeGetContent(node); break; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index fe0f0bcdc7..b66e67254a 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -471,6 +471,7 @@ virStoragePoolDefParseSource(xmlXPathContextPtr ctxt, port); goto cleanup; } + VIR_FREE(port); } } } diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c index 8d3377c04e..650216d006 100644 --- a/src/util/virsysinfo.c +++ b/src/util/virsysinfo.c @@ -521,6 +521,8 @@ virSysinfoParseS390Processor(const char *base, virSysin= foDefPtr ret) &processor->processor_family, '=3D', '\n')) goto cleanup; + + VIR_FREE(procline); } result =3D 0; =20 --=20 2.12.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list