From: Ján Tomko <jtomko@redhat.com>
Date: Tue, 14 Apr 2015 10:30:55 +0000 (+0200)
Subject: Ignore storage volumes with control codes in their names
X-Git-Tag: v1.2.9.3~25
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d1c041808a2496b1ff5c0914520d92982b4b37f;p=thirdparty%2Flibvirt.git

Ignore storage volumes with control codes in their names

To prevent generating invalid XML.

https://bugzilla.redhat.com/show_bug.cgi?id=1066564
(cherry picked from commit 60db2bc80fb5048b227c77c5138fe0e2c97e9c14)
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
index 0f8ceee549..10a8f3345b 100644
--- a/src/storage/storage_backend_fs.c
+++ b/src/storage/storage_backend_fs.c
@@ -863,6 +863,12 @@ virStorageBackendFileSystemRefresh(virConnectPtr conn ATTRIBUTE_UNUSED,
     while ((direrr = virDirRead(dir, &ent, pool->def->target.path)) > 0) {
         int ret;
 
+        if (virStringHasControlChars(ent->d_name)) {
+            VIR_WARN("Ignoring file with control characters under '%s'",
+                     pool->def->target.path);
+            continue;
+        }
+
         if (VIR_ALLOC(vol) < 0)
             goto error;