From: Pavel Hrdina <phrdina@redhat.com>
Date: Fri, 18 Aug 2017 13:17:34 +0000 (+0200)
Subject: conf: error out for multiple protocol elements while parsing chardev
X-Git-Tag: v3.7.0-rc1~68
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=209fa11b0210143709c0b8c16b64c7e456095fb9;p=thirdparty%2Flibvirt.git

conf: error out for multiple protocol elements while parsing chardev

Remove check whether a variable was already set because the element
is parsed only once now.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7431de20da..36c8c77f7e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10926,6 +10926,7 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
     char *haveTLS = NULL;
     char *tlsFromConfig = NULL;
     bool logParsed = false;
+    bool protocolParsed = false;
     int sourceParsed = 0;
 
     for (; cur; cur = cur->next) {
@@ -11040,8 +11041,14 @@ virDomainChrSourceDefParseXML(virDomainChrSourceDefPtr def,
             logfile = virXMLPropString(cur, "file");
             logappend = virXMLPropString(cur, "append");
         } else if (virXMLNodeNameEqual(cur, "protocol")) {
-            if (!protocol)
-                protocol = virXMLPropString(cur, "type");
+            if (protocolParsed) {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("only one log element is allowed for "
+                                 "character device"));
+                goto error;
+            }
+            protocolParsed = true;
+            protocol = virXMLPropString(cur, "type");
         }
     }