From a6b81d558134110c9c0aaeb287b11dbada526d06 Mon Sep 17 00:00:00 2001
From: Roman Bogorodskiy <bogorodskiy@gmail.com>
Date: Sun, 13 Nov 2016 13:01:34 +0300
Subject: [PATCH] bhyve: fix memory leaks in bhyvexml2argvtest

 * virNetDevTapCreateInBridgePort() mock: free '*ifname' before
   strdupping a hardoded value to it
 * testCompareXMLToArgvFiles(): unref 'conn' object in cleanup
 * testCompareXMLToArgvHelper(): free 'ldargs' and 'dmargs' in
   cleanup
---
 tests/bhyvexml2argvmock.c | 2 ++
 tests/bhyvexml2argvtest.c | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c
index 41058caf73..a8516327c2 100644
--- a/tests/bhyvexml2argvmock.c
+++ b/tests/bhyvexml2argvmock.c
@@ -1,5 +1,6 @@
 #include <config.h>
 
+#include "viralloc.h"
 #include "virstring.h"
 #include "virnetdev.h"
 #include "virnetdevtap.h"
@@ -29,6 +30,7 @@ int virNetDevTapCreateInBridgePort(const char *brname ATTRIBUTE_UNUSED,
                                    virNetDevVlanPtr virtVlan ATTRIBUTE_UNUSED,
                                    unsigned int fakeflags ATTRIBUTE_UNUSED)
 {
+    VIR_FREE(*ifname);
     if (VIR_STRDUP(*ifname, "vnet0") < 0)
         return -1;
     return 0;
diff --git a/tests/bhyvexml2argvtest.c b/tests/bhyvexml2argvtest.c
index b85439bb1b..22a902c53d 100644
--- a/tests/bhyvexml2argvtest.c
+++ b/tests/bhyvexml2argvtest.c
@@ -86,6 +86,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
     virCommandFree(cmd);
     virCommandFree(ldcmd);
     virDomainDefFree(vmdef);
+    virObjectUnref(conn);
     return ret;
 }
 
@@ -117,6 +118,8 @@ testCompareXMLToArgvHelper(const void *data)
  cleanup:
     VIR_FREE(xml);
     VIR_FREE(args);
+    VIR_FREE(ldargs);
+    VIR_FREE(dmargs);
     return ret;
 }
 
-- 
GitLab