[libvirt] [PATCH 05/15] test: Fix fchosttest resource leak

John Ferlan jferlan at redhat.com
Wed Jan 25 20:27:31 UTC 2017


Commit id '666bee3' made fabric_name optional; however, if fabric name
was present, then a leak would occur.

Signed-off-by: John Ferlan <jferlan at redhat.com>
---
 tests/fchosttest.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/fchosttest.c b/tests/fchosttest.c
index bb35b88..0b4a8f2 100644
--- a/tests/fchosttest.c
+++ b/tests/fchosttest.c
@@ -159,6 +159,7 @@ test6(const void *data ATTRIBUTE_UNUSED)
     const char *expect_wwpn = "2102001b32a9da4e";
     char *wwnn = NULL;
     char *wwpn = NULL;
+    char *fabric_wwn = NULL;
     int ret = -1;
 
     if (!(wwnn = virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM_NO_FAB,
@@ -169,8 +170,9 @@ test6(const void *data ATTRIBUTE_UNUSED)
                                "port_name")))
         goto cleanup;
 
-    if (virReadFCHost(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM_NO_FAB,
-                      "fabric_name"))
+    if ((fabric_wwn = virReadFCHost(TEST_FC_HOST_PREFIX,
+                                    TEST_FC_HOST_NUM_NO_FAB,
+                                    "fabric_name")))
         goto cleanup;
 
     if (STRNEQ(expect_wwnn, wwnn) ||
@@ -181,6 +183,7 @@ test6(const void *data ATTRIBUTE_UNUSED)
  cleanup:
     VIR_FREE(wwnn);
     VIR_FREE(wwpn);
+    VIR_FREE(fabric_wwn);
     return ret;
 }
 
-- 
2.7.4




More information about the libvir-list mailing list