From 5075248ac9e60dd73da3487f83be9aa188200688 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Mon, 12 Aug 2013 16:09:53 +0200 Subject: [PATCH] virsh-domain: Fix memleak in cmdUndefine with storage When undefining a domain with storage when the volume isn't managed by libvirt the name and path strings weren't freed properly. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=996050 --- tools/virsh-domain.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 3b2513b85a..ab3804a144 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3052,6 +3052,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) for (i = 0; i < nvolumes; i++) { ctxt->node = vol_nodes[i]; + VIR_FREE(source); + VIR_FREE(target); /* get volume source and target paths */ if (!(target = virXPathString("string(./target/@dev)", ctxt))) @@ -3094,6 +3096,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) } vlist[nvols].source = source; vlist[nvols].target = target; + source = NULL; + target = NULL; nvols++; } @@ -3193,6 +3197,8 @@ out: } cleanup: + VIR_FREE(source); + VIR_FREE(target); for (i = 0; i < nvols; i++) { VIR_FREE(vlist[i].source); VIR_FREE(vlist[i].target);