From: John Ferlan <jferlan@redhat.com>
Date: Fri, 31 May 2013 13:07:28 +0000 (-0400)
Subject: Resolve memory leak found by valgrind
X-Git-Tag: v1.0.6~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f3e7f1e36334a5e32b44df91247a37279aecee4;p=thirdparty%2Flibvirt.git

Resolve memory leak found by valgrind

Commit '6afdfc8e' adjusted the exit and error paths to go through the error
and cleanup labels, but neglected to remove the return ret prior to cleanup.
Also noted the 'type' xml string fetch was never checked for NULL which
could lead to some interesting results.
---

diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c
index f0ea41dfda..cc3d3d90e7 100644
--- a/src/conf/storage_conf.c
+++ b/src/conf/storage_conf.c
@@ -834,6 +834,12 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt)
     }
 
     type = virXPathString("string(./@type)", ctxt);
+    if (type == NULL) {
+        virReportError(VIR_ERR_XML_ERROR, "%s",
+                       _("storage pool missing type attribute"));
+        goto error;
+    }
+
     if ((ret->type = virStoragePoolTypeFromString(type)) < 0) {
         virReportError(VIR_ERR_XML_ERROR,
                        _("unknown storage pool type %s"), type);
@@ -956,8 +962,6 @@ virStoragePoolDefParseXML(xmlXPathContextPtr ctxt)
             goto error;
     }
 
-    return ret;
-
 cleanup:
     VIR_FREE(uuid);
     VIR_FREE(type);