From db0a18a165dba1e742dbcac2813535e18a86801b Mon Sep 17 00:00:00 2001
From: Jiri Denemark <jdenemar@redhat.com>
Date: Thu, 4 Jul 2013 16:55:53 +0200
Subject: [PATCH] Fix NULL dereference caused by ACL filtering of domains

Caused by 763973607ddace04562da1a1e545ab6692d5175f.
---
 src/libxl/libxl_driver.c | 3 ++-
 src/qemu/qemu_driver.c   | 6 ++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
index 1bae3d65a3..ededbbc2f3 100644
--- a/src/libxl/libxl_driver.c
+++ b/src/libxl/libxl_driver.c
@@ -3221,7 +3221,8 @@ libxlConnectNumOfDefinedDomains(virConnectPtr conn)
 
     libxlDriverLock(driver);
     n = virDomainObjListNumOfDomains(driver->domains, false,
-                                     virConnectNumOfDefinedDomainsCheckACL, NULL);
+                                     virConnectNumOfDefinedDomainsCheckACL,
+                                     conn);
     libxlDriverUnlock(driver);
 
     return n;
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 94cebe8b71..1b9ba41f88 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -5887,7 +5887,8 @@ static int qemuConnectListDefinedDomains(virConnectPtr conn,
         goto cleanup;
 
     ret = virDomainObjListGetInactiveNames(driver->domains, names, nnames,
-                                           virConnectListDefinedDomainsCheckACL, NULL);
+                                           virConnectListDefinedDomainsCheckACL,
+                                           conn);
 
 cleanup:
     return ret;
@@ -5901,7 +5902,8 @@ static int qemuConnectNumOfDefinedDomains(virConnectPtr conn) {
         goto cleanup;
 
     ret = virDomainObjListNumOfDomains(driver->domains, false,
-                                       virConnectNumOfDefinedDomainsCheckACL, NULL);
+                                       virConnectNumOfDefinedDomainsCheckACL,
+                                       conn);
 
 cleanup:
     return ret;