c5b0b3ef9d
Fix race starting multiple session daemons (bz #1200149) Fix change-media success messages Strip invalid control codes from XML (bz #1066564, bz #1184131)
30 lines
1.0 KiB
Diff
30 lines
1.0 KiB
Diff
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
Date: Tue, 14 Apr 2015 12:30:55 +0200
|
|
Subject: [PATCH] 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)
|
|
---
|
|
src/storage/storage_backend_fs.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c
|
|
index 35385db..4561ee0 100644
|
|
--- a/src/storage/storage_backend_fs.c
|
|
+++ b/src/storage/storage_backend_fs.c
|
|
@@ -861,6 +861,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;
|
|
|