[libvirt] [PATCH 3/3] conf: Rework virDomainSEVDefParseXML()
Firstly, this function changes node for relative XPaths but
doesn't restore the original one in case VIR_ALLOC(def) fails.
Secondly, @type is leaked. Thirdly, dh-cert and session
attributes are strdup()-ed needlessly, virXPathString already
does that so we can use the retval immediately.
Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com>
---
src/conf/domain_conf.c | 30 +++++++++---------------------
1 file changed, 9 insertions(+), 21 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 85f07af46e..c788b525b5 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -15849,17 +15849,16 @@ static virDomainSevDefPtr
virDomainSEVDefParseXML(xmlNodePtr sevNode,
xmlXPathContextPtr ctxt)
{
- char *tmp = NULL;
char *type = NULL;
xmlNodePtr save = ctxt->node;
virDomainSevDefPtr def;
unsigned long policy;
+ if (VIR_ALLOC(def) < 0)
+ return NULL;
+
ctxt->node = sevNode;
- if (VIR_ALLOC(def) < 0)
- return NULL;
-
if (!(type = virXMLPropString(sevNode, "type"))) {
virReportError(VIR_ERR_XML_ERROR, "%s",
_("missing launch-security type"));
@@ -15899,29 +15898,18 @@ virDomainSEVDefParseXML(xmlNodePtr sevNode,
}
def->policy = policy;
+ def->dh_cert = virXPathString("string(./dh-cert)", ctxt);
+ def->session = virXPathString("string(./session)", ctxt);
- if ((tmp = virXPathString("string(./dh-cert)", ctxt))) {
- if (VIR_STRDUP(def->dh_cert, tmp) < 0)
- goto error;
-
- VIR_FREE(tmp);
- }
-
- if ((tmp = virXPathString("string(./session)", ctxt))) {
- if (VIR_STRDUP(def->session, tmp) < 0)
- goto error;
-
- VIR_FREE(tmp);
- }
-
+ cleanup:
+ VIR_FREE(type);
ctxt->node = save;
return def;
error:
- VIR_FREE(tmp);
virDomainSEVDefFree(def);
- ctxt->node = save;
- return NULL;
+ def = NULL;
+ goto cleanup;
}
static virDomainMemoryDefPtr
--
2.16.4