From: Jim Meyering <meyering@redhat.com>
Date: Tue, 26 Jan 2010 19:17:07 +0000 (+0100)
Subject: xen_hypervisor.c: avoid NULL deref for NULL domain argument
X-Git-Tag: v0.7.6~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b62bf7a7002867df810720f329973963610d28ea;p=thirdparty%2Flibvirt.git

xen_hypervisor.c: avoid NULL deref for NULL domain argument

* src/xen/xen_hypervisor.c (xenHypervisorGetVcpus): Don't attempt
to diagnose an unlikely NULL-domain or NULL-domain->conn error.
---

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 7f3909511c..9f76f90538 100644
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -1,7 +1,7 @@
 /*
  * xen_internal.c: direct access to Xen hypervisor level
  *
- * Copyright (C) 2005, 2006, 2007, 2008, 2009 Red Hat, Inc.
+ * Copyright (C) 2005-2010 Red Hat, Inc.
  *
  * See COPYING.LIB for the License of this software
  *
@@ -3477,11 +3477,8 @@ xenHypervisorGetVcpus(virDomainPtr domain, virVcpuInfoPtr info, int maxinfo,
     virVcpuInfoPtr ipt;
     int nbinfo, i;
 
-    if (domain == NULL || domain->conn == NULL) {
-        virXenErrorFunc (domain->conn, VIR_ERR_INVALID_ARG, __FUNCTION__,
-                        "invalid argument", 0);
+    if (domain == NULL || domain->conn == NULL)
         return -1;
-    }
 
     priv = (xenUnifiedPrivatePtr) domain->conn->privateData;
     if (priv->handle < 0 || (domain->id < 0) ||