From: Jim Meyering <meyering@redhat.com>
Date: Mon, 29 Mar 2010 15:43:01 +0000 (+0200)
Subject: domain_event.c: don't deref NULL on an OOM error path
X-Git-Tag: v0.8.0~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c8877e74390bc71f3cd31a2d9507e31ffc739cb;p=thirdparty%2Flibvirt.git

domain_event.c: don't deref NULL on an OOM error path

* 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.
---

diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
index fac5e49358..07d6a55f37 100644
--- a/src/conf/domain_event.c
+++ b/src/conf/domain_event.c
@@ -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;