From: Daniel P. Berrange <berrange@redhat.com>
Date: Thu, 24 Jan 2013 18:36:04 +0000 (+0000)
Subject: Fix crash free'ing securityDriverNames in QEMU driver
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bbc663b1c337be1f8bf6d9c3a4e0269cdbfbff9b;p=libvirt.git

Fix crash free'ing securityDriverNames in QEMU driver

The previous fix to avoid leaking securityDriverNames forgot to
handle the case of securityDriverNames being NULL, leading to
a crash

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 1f43d54978..12769c7fa2 100644
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -1134,7 +1134,8 @@ qemuShutdown(void) {
     VIR_FREE(qemu_driver->saveImageFormat);
     VIR_FREE(qemu_driver->dumpImageFormat);
 
-    for (i = 0 ; qemu_driver->securityDriverNames[i] != NULL ; i++)
+    for (i = 0 ; (qemu_driver->securityDriverNames != NULL &&
+                  qemu_driver->securityDriverNames[i] != NULL) ; i++)
         VIR_FREE(qemu_driver->securityDriverNames[i]);
     VIR_FREE(qemu_driver->securityDriverNames);
     virSecurityManagerFree(qemu_driver->securityManager);