[libvirt] [PATCH 02/12] tests: testQemuCapsIterate: Don't ignore malformed file names

Andrea Bolognani abologna at redhat.com
Wed Oct 23 10:42:52 UTC 2019


If files whose name doesn't follow the expected format are added
to the repository, it's better to make the test suite fail than to
silently ignore them.

Signed-off-by: Andrea Bolognani <abologna at redhat.com>
---
 tests/testutilsqemu.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 0faa9cb84a..7a2ea3bf4e 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -910,7 +910,7 @@ testQemuCapsIterate(const char *suffix,
         goto cleanup;
 
     while ((rc = virDirRead(dir, &ent, TEST_QEMU_CAPS_PATH)) > 0) {
-        char *tmp = ent->d_name;
+        g_autofree char *tmp = g_strdup(ent->d_name);
         char *base = NULL;
         char *archName = NULL;
 
@@ -918,9 +918,11 @@ testQemuCapsIterate(const char *suffix,
         if (!virStringStripSuffix(tmp, suffix))
             continue;
 
-        /* Find the last dot, moving on if none is present */
-        if (!(archName = strrchr(tmp, '.')))
-            continue;
+        /* Find the last dot */
+        if (!(archName = strrchr(tmp, '.'))) {
+            VIR_TEST_VERBOSE("malformed file name '%s'", ent->d_name);
+            goto cleanup;
+        }
 
         /* The base name is everything before the last dot, and
          * the architecture name everything after it */
-- 
2.21.0




More information about the libvir-list mailing list