diff --git a/ChangeLog b/ChangeLog index 0888db5e3a..f71e040ed4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jan 15 01:19:02 GMT 2009 John Levon + + * src/xen_unified.c: + * src/xs_internal.c: Fix activeDomainList handling + Thu Jan 15 01:16:05 GMT 2009 John Levon * src/xen_unified.c: Fix ref-counting for Xen driver event diff --git a/src/xen_unified.c b/src/xen_unified.c index 1d39c4e4f2..65f7d50630 100644 --- 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; icount; 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 56e6f9be53..80c30bd1f6 100644 --- 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);