From: Peter Krempa <pkrempa@redhat.com>
Date: Mon, 22 Nov 2021 16:43:13 +0000 (+0100)
Subject: virSecurityLabelDefParseXML: Don't use virXMLPropStringLimit
X-Git-Tag: v7.10.0-rc1~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01ab6513bd5c965cd127dfdaf5ab4470f77d9741;p=thirdparty%2Flibvirt.git

virSecurityLabelDefParseXML: Don't use virXMLPropStringLimit

The function produces an error which is ignored in this code path.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 13395a7023..5cfb2d91eb 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7804,8 +7804,9 @@ virSecurityLabelDefParseXML(xmlXPathContextPtr ctxt,
     g_autofree char *relabel = NULL;
     g_autoptr(virSecurityLabelDef) seclabel = NULL;
 
-    model = virXMLPropStringLimit(ctxt->node, "model",
-                                  VIR_SECURITY_MODEL_BUFLEN - 1);
+    if ((model = virXMLPropString(ctxt->node, "model")) &&
+        strlen(model) >= VIR_SECURITY_MODEL_BUFLEN - 1)
+        g_clear_pointer(&model, g_free);
 
     if (!(seclabel = virSecurityLabelDefNew(model)))
         return NULL;