From a2d2939673d2e77d1297ae054795fd337dd0a95f Mon Sep 17 00:00:00 2001 Message-Id: From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Wed, 28 Aug 2013 10:24:09 +0200 Subject: [PATCH] virsh: free the caps list properly if one of them is invalid https://bugzilla.redhat.com/show_bug.cgi?id=1001957 VIR_FREE(caps) is not enough to free an array allocated by vshStringToArray. ==17== 4 bytes in 1 blocks are definitely lost in loss record 4 of 728 ==17== by 0x4EFFC44: virStrdup (virstring.c:554) ==17== by 0x128B10: _vshStrdup (virsh.c:125) ==17== by 0x129164: vshStringToArray (virsh.c:218) ==17== by 0x157BB3: cmdNodeListDevices (virsh-nodedev.c:409) https://bugzilla.redhat.com/show_bug.cgi?id=1001536 (cherry picked from commit 14d5328681448267dfc0812948fa2c6ec4dfa7d4) --- tools/virsh-nodedev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 5522405..92ef40c 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -413,8 +413,8 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) for (i = 0; i < ncaps; i++) { if ((cap_type = virNodeDevCapTypeFromString(caps[i])) < 0) { vshError(ctl, "%s", _("Invalid capability type")); - VIR_FREE(caps); - return false; + ret = false; + goto cleanup; } switch (cap_type) { -- 1.8.3.2