From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 3 Sep 2014 16:54:56 +0000 (+0200)
Subject: util: storage: Convert disk locality check to switch statement
X-Git-Tag: CVE-2014-3633~111
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc12cec6f672575515e7ff9d043010f6275065d8;p=thirdparty%2Flibvirt.git

util: storage: Convert disk locality check to switch statement

To allow the compiler to track future additions of disk types, convert
the function to use a switch statement with the correct type.
---

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index 5b6b2f58ec..299edcd48e 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1956,7 +1956,22 @@ virStorageSourceGetActualType(virStorageSourcePtr def)
 bool
 virStorageSourceIsLocalStorage(virStorageSourcePtr src)
 {
-    return virStorageSourceGetActualType(src) != VIR_STORAGE_TYPE_NETWORK;
+    virStorageType type = virStorageSourceGetActualType(src);
+
+    switch (type) {
+    case VIR_STORAGE_TYPE_FILE:
+    case VIR_STORAGE_TYPE_BLOCK:
+    case VIR_STORAGE_TYPE_DIR:
+        return true;
+
+    case VIR_STORAGE_TYPE_NETWORK:
+    case VIR_STORAGE_TYPE_VOLUME:
+    case VIR_STORAGE_TYPE_LAST:
+    case VIR_STORAGE_TYPE_NONE:
+        return false;
+    }
+
+    return false;
 }