[libvirt] [PATCH v2] storage: Avoid leak in virStorageUtilGlusterExtractPoolSources()

Andrea Bolognani abologna at redhat.com
Thu Apr 6 07:53:11 UTC 2017


The contents of volname would be leaked if the function were
to be passed an invalid pooltype by the caller.

Make sure the memory is released instead.
---
Changes from v1:

  * use VIR_STEAL_PTR() instead of open-coding it.

 src/storage/storage_util.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
index 7cc125a..8e25984 100644
--- a/src/storage/storage_util.c
+++ b/src/storage/storage_util.c
@@ -2846,7 +2846,7 @@ virStorageUtilGlusterExtractPoolSources(const char *host,
     xmlXPathContextPtr ctxt = NULL;
     xmlNodePtr *nodes = NULL;
     virStoragePoolSource *src = NULL;
-    char *volname;
+    char *volname = NULL;
     size_t i;
     int nnodes;
     int ret = -1;
@@ -2871,12 +2871,11 @@ virStorageUtilGlusterExtractPoolSources(const char *host,
 
         if (pooltype == VIR_STORAGE_POOL_NETFS) {
             src->format = VIR_STORAGE_POOL_NETFS_GLUSTERFS;
-            src->dir = volname;
+            VIR_STEAL_PTR(src->dir, volname);
         } else if (pooltype == VIR_STORAGE_POOL_GLUSTER) {
-            src->name = volname;
-
             if (VIR_STRDUP(src->dir, "/") < 0)
                 goto cleanup;
+            VIR_STEAL_PTR(src->name, volname);
         } else {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                            _("unsupported gluster lookup"));
@@ -2894,6 +2893,7 @@ virStorageUtilGlusterExtractPoolSources(const char *host,
     ret = nnodes;
 
  cleanup:
+    VIR_FREE(volname);
     VIR_FREE(nodes);
     xmlXPathFreeContext(ctxt);
     xmlFreeDoc(doc);
-- 
2.7.4




More information about the libvir-list mailing list