[libvirt] [PATCH] virsh-domain: Add a missing check and fix leak in cmdScreenshot

--- tools/virsh-domain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 856e888..7fe42df 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -4610,7 +4610,8 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; - st = virStreamNew(ctl->conn, 0); + if (!(st = virStreamNew(ctl->conn, 0))) + goto cleanup; mime = virDomainScreenshot(dom, st, screen, flags); if (!mime) { @@ -4620,7 +4621,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd) if (!file) { if (!(file=vshGenFileName(ctl, dom, mime))) - return false; + goto cleanup; generated = true; } -- 1.7.1

On 09/25/2013 08:54 AM, Hongwei Bi wrote:
--- tools/virsh-domain.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
@@ -4620,7 +4621,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd)
if (!file) { if (!(file=vshGenFileName(ctl, dom, mime)))
I fixed up the spacing of this = while at it.
- return false; + goto cleanup;
ACK and pushed. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake
-
Hongwei Bi