From 67e2804ecb811511dcd9a6ea052be0f339f3ab40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 8 May 2009 10:14:30 +0000
Subject: [PATCH] fix crash when init fails early (i.e. due to vbox not being
 installed)

---
 ChangeLog            | 5 +++++
 src/vbox/vbox_tmpl.c | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 7f2c44078c..9b803bb1a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May  8 12:09:12 CEST 2009 Guido Günther <agx@sigxcpu.org>
+
+	* src/vbox/vbox_tmpl.c (vboxUninitialize): fix crash when init fails
+	  early (i.e. due to vbox not being installed)
+
 Fri May  8 11:10:22 BST 2009 Daniel P. Berrange <berrange@redhat.com>
 
 	* src/qemu_driver.c: Make name & UUID uniqueness checking in
diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 72971723f6..6507a69782 100644
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -291,7 +291,8 @@ static int vboxExtractVersion(virConnectPtr conn, vboxGlobalData *data) {
 }
 
 static void vboxUninitialize(vboxGlobalData *data) {
-    data->pFuncs->pfnComUninitialize();
+    if (data->pFuncs)
+        data->pFuncs->pfnComUninitialize();
     VBoxCGlueTerm();
 
     if (!data)