Fix activeDomainList handling

diff --git a/ChangeLog b/ChangeLog
index 0888db5e3ae19ac16ac5c29fed745afcdd6a69b1..f71e040ed4e6a72fac9747dc5bbe023efba0ab48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jan 15 01:19:02 GMT 2009  John Levon  <levon@movementarian.org>
+
+       * src/xen_unified.c:
+       * src/xs_internal.c: Fix activeDomainList handling
+
 Thu Jan 15 01:16:05 GMT 2009  John Levon  <levon@movementarian.org>
 
        * src/xen_unified.c: Fix ref-counting for Xen driver event

diff --git a/src/xen_unified.c b/src/xen_unified.c
index 1d39c4e4f25ad9fba856232bc1a5fea5174dd0f9..65f7d50630ddf9dd0117cb41eba1226365644c8e 100644 (file)
--- a/src/xen_unified.c
+++ b/src/xen_unified.c
@@ -1484,6 +1484,10 @@ void
 xenUnifiedDomainInfoListFree(xenUnifiedDomainInfoListPtr list)
 {
     int i;
+
+    if (list == NULL)
+        return;
+
     for (i=0; i<list->count; i++) {
         VIR_FREE(list->doms[i]->name);
         VIR_FREE(list->doms[i]);

diff --git a/src/xs_internal.c b/src/xs_internal.c
index 56e6f9be53080801c2793cb1aecee6b15e5e0777..80c30bd1f63007b4bca8a1e0c0d997cb04a16f32 100644 (file)
--- a/src/xs_internal.c
+++ b/src/xs_internal.c
@@ -388,8 +388,10 @@ xenStoreClose(virConnectPtr conn)
     }
 
     xenStoreWatchListFree(priv->xsWatchList);
+    priv->xsWatchList = NULL;
 #ifndef PROXY
     xenUnifiedDomainInfoListFree(activeDomainList);
+    activeDomainList = NULL;
 #endif
     if (priv->xshandle == NULL)
         return(-1);