From: Peter Krempa <pkrempa@redhat.com>
Date: Fri, 7 Mar 2014 10:38:18 +0000 (+0100)
Subject: util: storagefile: Don't pursue backing chain of NULL image
X-Git-Tag: v1.2.3~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6c312b0d1ea9faf8161f0dbaaea67d54ba4c401d;p=thirdparty%2Flibvirt.git

util: storagefile: Don't pursue backing chain of NULL image

When virStorageFileGetMetadata is called with NULL path argument, the
invalid pointer boils down through the recursive worker and is caught by
virHashAddEntry which is thankfully resistant to NULL arguments. As it
doesn't make sense to pursue backing chains of NULL volumes, exit
earlier.

This was noticed in the virt-aahelper-test with a slightly modified
codebase.
---

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index c7384d1dc4..8370d23550 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -1118,7 +1118,7 @@ virStorageFileGetMetadata(const char *path, int format,
     virHashTablePtr cycle = virHashCreate(5, NULL);
     virStorageFileMetadataPtr ret;
 
-    if (!cycle)
+    if (!cycle || !path)
         return NULL;
 
     if (format <= VIR_STORAGE_FILE_NONE)