From: John Ferlan <jferlan@redhat.com>
Date: Wed, 27 Aug 2014 11:56:00 +0000 (-0400)
Subject: storage_driver: Resolve Coverity REVERSE_INULL
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bab35f74196be35e1f3801426755a20ec0d7c0a7;p=people%2Fliuw%2Flibxenctrl-split%2Flibvirt.git

storage_driver: Resolve Coverity REVERSE_INULL

There were two occurrances of attempting to initialize actualType by
calling virStorageSourceGetActualType(src) prior to a check if (!src)
resulting in Coverity complaining about the possible NULL dereference
in virStorageSourceGetActualType() of src.

Resolve by moving the actualType setting until after checking !src
---

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 5ddc23a7d..433d7b723 100644
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -2441,11 +2441,12 @@ virStorageFileIsInitialized(virStorageSourcePtr src)
 static bool
 virStorageFileSupportsBackingChainTraversal(virStorageSourcePtr src)
 {
-    int actualType = virStorageSourceGetActualType(src);
+    int actualType;
     virStorageFileBackendPtr backend;
 
     if (!src)
         return false;
+    actualType = virStorageSourceGetActualType(src);
 
     if (src->drv) {
         backend = src->drv->backend;
@@ -2473,11 +2474,12 @@ virStorageFileSupportsBackingChainTraversal(virStorageSourcePtr src)
 bool
 virStorageFileSupportsSecurityDriver(virStorageSourcePtr src)
 {
-    int actualType = virStorageSourceGetActualType(src);
+    int actualType;
     virStorageFileBackendPtr backend;
 
     if (!src)
         return false;
+    actualType = virStorageSourceGetActualType(src);
 
     if (src->drv) {
         backend = src->drv->backend;