Re: [libvirt] [PATCH] vbox_tmpl.c: avoid NULL deref upon vboxDomainCreateXML failure

Similar to others, >From 5dcb4d95a351cb6fa32ebaafb96756275e1079e2 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com&gt; Date: Wed, 16 Dec 2009 13:56:57 +0100 Subject: [PATCH] vbox_tmpl.c: avoid NULL deref upon vboxDomainCreateXML failure * src/vbox/vbox_tmpl.c (vboxDomainCreateXML): Don't call vboxDomainUndefine on a NULL "dom". ---  src/vbox/vbox_tmpl.c |   16 +++++-----------  1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index d6b681c..ba70053 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -990,8 +990,6 @@ cleanup:  static virDomainPtr vboxDomainCreateXML(virConnectPtr conn, const char *xml,                                         unsigned int flags ATTRIBUTE_UNUSED) { -    virDomainPtr dom = NULL; -     /* VirtualBox currently doesn't have support for running      * virtual machines without actually defining them and thus      * for time being just define new machine and start it. @@ -1000,17 +998,13 @@ static virDomainPtr vboxDomainCreateXML(virConnectPtr conn, const char *xml,      * change this behaviour to the expected one.      */ -    dom = vboxDomainDefineXML(conn, xml); -    if (dom) { -        if (vboxDomainCreate(dom) < 0) -            goto cleanup; -    } else { -        goto cleanup; -    } +    virDomainPtr dom = vboxDomainDefineXML(conn, xml); +    if (dom == NULL) +        return NULL; -    return dom; +    if (0 < vboxDomainCreate(dom)) +        return dom;

-cleanup:     vboxDomainUndefine(dom);     return NULL;  } -- 1.6.6.rc2.275.g51e2d