]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
domain_event.c: don't deref NULL on an OOM error path
authorJim Meyering <meyering@redhat.com>
Mon, 29 Mar 2010 15:43:01 +0000 (17:43 +0200)
committerJim Meyering <meyering@redhat.com>
Wed, 7 Apr 2010 14:20:28 +0000 (16:20 +0200)
* src/conf/domain_event.c (virDomainEventGraphicsNewFromDom):
Return NULL when handling out-of-memory error, rather than
falling through with ev=NULL and then assigning to ev->member.
(virDomainEventGraphicsNewFromObj): Likewise.

src/conf/domain_event.c

index fac5e49358d660d660731a8ca880b747e532c6d9..07d6a55f37d51841e56872c3aafa41b9677ce6fa 100644 (file)
@@ -687,7 +687,7 @@ virDomainEventPtr virDomainEventGraphicsNewFromDom(virDomainPtr dom,
         ev->data.graphics.phase = phase;
         if (!(ev->data.graphics.authScheme = strdup(authScheme))) {
             virDomainEventFree(ev);
-            ev = NULL;
+            return NULL;
         }
         ev->data.graphics.local = local;
         ev->data.graphics.remote = remote;
@@ -712,7 +712,7 @@ virDomainEventPtr virDomainEventGraphicsNewFromObj(virDomainObjPtr obj,
         ev->data.graphics.phase = phase;
         if (!(ev->data.graphics.authScheme = strdup(authScheme))) {
             virDomainEventFree(ev);
-            ev = NULL;
+            return NULL;
         }
         ev->data.graphics.local = local;
         ev->data.graphics.remote = remote;