]> xenbits.xensource.com Git - libvirt.git/commitdiff
Fix crash free'ing securityDriverNames in QEMU driver
authorDaniel P. Berrange <berrange@redhat.com>
Thu, 24 Jan 2013 18:36:04 +0000 (18:36 +0000)
committerDaniel P. Berrange <berrange@redhat.com>
Thu, 24 Jan 2013 18:36:37 +0000 (18:36 +0000)
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>
src/qemu/qemu_driver.c

index 1f43d5497823ac6522922c2c31f5bc6aededd437..12769c7fa2f3d0c3dc21ca954c77189924b8cb56 100644 (file)
@@ -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);