From: Martin Kletzander <mkletzan@redhat.com>
Date: Mon, 19 Mar 2012 10:05:30 +0000 (+0100)
Subject: virConfGetValue: Fixed NULL pointer check
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3992cfdd793bcf7c909388226896b6cb42e39b0d;p=libvirt.git

virConfGetValue: Fixed NULL pointer check

This patch fixes a NULL pointer check that was causing SegFault on
some specific configurations. It also reverts commit 59d0c9801c1ab
that was checking for this value in one place.
---

diff --git a/src/libvirt.c b/src/libvirt.c
index 7f8d42c797..99b263efc1 100644
--- a/src/libvirt.c
+++ b/src/libvirt.c
@@ -1085,8 +1085,7 @@ virConnectOpenResolveURIAlias(virConfPtr conf,
 
     *uri = NULL;
 
-    if (conf &&
-        (value = virConfGetValue(conf, "uri_aliases")))
+    if ((value = virConfGetValue(conf, "uri_aliases")))
         ret = virConnectOpenFindURIAliasMatch(value, alias, uri);
     else
         ret = 0;
diff --git a/src/util/conf.c b/src/util/conf.c
index 8ad60e02c8..3370337291 100644
--- a/src/util/conf.c
+++ b/src/util/conf.c
@@ -1,7 +1,7 @@
 /**
  * conf.c: parser for a subset of the Python encoded Xen configuration files
  *
- * Copyright (C) 2006-2011 Red Hat, Inc.
+ * Copyright (C) 2006-2012 Red Hat, Inc.
  *
  * See COPYING.LIB for the License of this software
  *
@@ -836,6 +836,9 @@ virConfGetValue(virConfPtr conf, const char *setting)
 {
     virConfEntryPtr cur;
 
+    if (conf == NULL)
+        return NULL;
+
     cur = conf->entries;
     while (cur != NULL) {
         if ((cur->name != NULL) &&