Fix NULL crash & integer overflow

diff --git a/ChangeLog b/ChangeLog
index ae77f058f73b695b3a2c31fc937e4e3b06c776ad..c8c77fa51f0a80eb3962d8ee013f2b0eaa1bedd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec  7 20:44:53 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/test.c: Fix integer long long overflow. Fix NULL defernce
+
 Sun Dec  7 20:20:53 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * src/test.c: Remove bogus refresh call causing deadlock

diff --git a/src/test.c b/src/test.c
index a5b7c25cb0eedaefe1e1c5c9f02abc790ff3297d..257fc8a3cbd95db53a8490b4732b1cceb95c7db7 100644 (file)
--- a/src/test.c
+++ b/src/test.c
@@ -191,7 +191,7 @@ static const char *defaultPoolXML =
 "  </target>"
 "</pool>";
 
-static const unsigned long long defaultPoolCap = (100 * 1024 * 1024 * 1024ul);
+static const unsigned long long defaultPoolCap = (100 * 1024 * 1024 * 1024ull);
 static const unsigned long long defaultPoolAlloc = 0;
 
 static int testStoragePoolObjSetDefaults(virStoragePoolObjPtr pool);
@@ -2997,10 +2997,10 @@ testStorageVolumeCreateXML(virStoragePoolPtr pool,
                                 privpool->def->allocation);
 
     privpool->volumes.objs[privpool->volumes.count++] = privvol;
-    privvol = NULL;
 
     ret = virGetStorageVol(pool->conn, privpool->def->name,
                            privvol->name, privvol->key);
+    privvol = NULL;
 
 cleanup:
     virStorageVolDefFree(privvol);