Fix storage driver null dereference.

diff --git a/ChangeLog b/ChangeLog
index 82bb4f45f3d34f04046edf388184774ecb7d9c1c..3f5fe1e4b686e2239fdd97f3f0ff68746a994d2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon Dec 22 11:33:16 EST 2008 Cole Robinson <crobinso@redhat.com>
+
+       * src/storage_driver.c: Fix storage driver null dereference.
+
 Mon Dec 22 11:27:52 EST 2008 Cole Robinson <crobinso@redhat.com>
 
        * src/virsh.c: Merge xml building for virsh pool-*-as

diff --git a/src/storage_driver.c b/src/storage_driver.c
index e92f12278fc36fcd64c9e42fb0d3fb2ce8979410..7f48719406e39d169f18dc870aa695a88d69e021 100644 (file)
--- a/src/storage_driver.c
+++ b/src/storage_driver.c
@@ -544,12 +544,13 @@ storagePoolDefine(virConnectPtr conn,
 
     if (!(pool = virStoragePoolObjAssignDef(conn, &driver->pools, def)))
         goto cleanup;
-    def = NULL;
 
     if (virStoragePoolObjSaveDef(conn, driver, pool, def) < 0) {
         virStoragePoolObjRemove(&driver->pools, pool);
+        def = NULL;
         goto cleanup;
     }
+    def = NULL;
 
     ret = virGetStoragePool(conn, pool->def->name, pool->def->uuid);