From: Daniel P. Berrange <berrange@redhat.com>
Date: Mon, 23 Sep 2013 13:09:19 +0000 (+0100)
Subject: Fix crash if OOM occurs when creating virConnectPtr
X-Git-Tag: v1.1.3-rc1~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f27490b7057a59b8b9475d15fc5b397c0b038c13;p=thirdparty%2Flibvirt.git

Fix crash if OOM occurs when creating virConnectPtr

If a OOM error occurs in virGetConnect, this may cause the
virConnectDispose method to de-reference a NULL pointer,
since the close callback will not have been initialized.

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

diff --git a/src/datatypes.c b/src/datatypes.c
index 940d968b46..161f1b0d05 100644
--- a/src/datatypes.c
+++ b/src/datatypes.c
@@ -164,11 +164,13 @@ virConnectDispose(void *obj)
 
     virURIFree(conn->uri);
 
-    virObjectLock(conn->closeCallback);
-    conn->closeCallback->callback = NULL;
-    virObjectUnlock(conn->closeCallback);
+    if (conn->closeCallback) {
+        virObjectLock(conn->closeCallback);
+        conn->closeCallback->callback = NULL;
+        virObjectUnlock(conn->closeCallback);
 
-    virObjectUnref(conn->closeCallback);
+        virObjectUnref(conn->closeCallback);
+    }
 
     virMutexUnlock(&conn->lock);
     virMutexDestroy(&conn->lock);