[libvirt] [PATCH] virsh-domain: Free dom before return false in cmdDump

--- tools/virsh-domain.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 856e888..f6d4edd 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4487,8 +4487,10 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; - if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) + if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) { + virDomainFree(dom); return false; + } if (vshCommandOptBool(cmd, "verbose")) verbose = true; -- 1.7.1

On 09/25/2013 07:49 AM, Hongwei Bi wrote:
--- tools/virsh-domain.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 856e888..f6d4edd 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4487,8 +4487,10 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false;
- if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) + if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) { + virDomainFree(dom); return false; + }
'goto cleanup' would do the same and it's easier to read. Alternatively, if we moved vshCommandOptStringReq before vshCommandOptDomain, 'return false' would be enough. Jan

On 09/25/13 13:23, Ján Tomko wrote:
On 09/25/2013 07:49 AM, Hongwei Bi wrote:
--- tools/virsh-domain.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 856e888..f6d4edd 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4487,8 +4487,10 @@ cmdDump(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false;
- if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) + if (vshCommandOptStringReq(ctl, cmd, "file", &to) < 0) { + virDomainFree(dom); return false; + }
'goto cleanup' would do the same and it's easier to read.
Alternatively, if we moved vshCommandOptStringReq before vshCommandOptDomain, 'return false' would be enough.
I'd prefer this option.
Jan
Peter
participants (3)
-
Hongwei Bi
-
Ján Tomko
-
Peter Krempa