[PATCH 4/9] virStorageFileGetMetadataRecurse: Expect NULL src->path

Peter Krempa pkrempa at redhat.com
Mon Feb 17 17:13:54 UTC 2020


The path can be NULL e.g. for NBD disks. Use NULLSTR to prevent use of
NULL in %s.

Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
 src/util/virstoragefile.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
index f8e4102588..cf37744d6f 100644
--- a/src/util/virstoragefile.c
+++ b/src/util/virstoragefile.c
@@ -4973,7 +4973,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
     g_autoptr(virStorageSource) backingStore = NULL;

     VIR_DEBUG("path=%s format=%d uid=%u gid=%u",
-              src->path, src->format,
+              NULLSTR(src->path), src->format,
               (unsigned int)uid, (unsigned int)gid);

     /* exit if we can't load information about the current image */
@@ -4995,7 +4995,7 @@ virStorageFileGetMetadataRecurse(virStorageSourcePtr src,
     if (virHashLookup(cycle, uniqueName)) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("backing store for %s (%s) is self-referential"),
-                       src->path, uniqueName);
+                       NULLSTR(src->path), uniqueName);
         goto cleanup;
     }

-- 
2.24.1




More information about the libvir-list mailing list