From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 24 May 2011 11:43:30 +0000 (+0200)
Subject: conf: Fix incorrect spice graphic XML format on compression options
X-Git-Tag: CVE-2011-2178~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=155542a57fa8498d762b00c3a7adc285c40a3ce9;p=thirdparty%2Flibvirt.git

conf: Fix incorrect spice graphic XML format on compression options

If spice graphics has no <channel> elements, the output graphics XML
is messed up. To prevent this, we need to end the <graphics> element
just before adding any compression selecting elements.
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 77ab1e5343..b40620208e 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -8998,6 +8998,12 @@ virDomainGraphicsDefFormat(virBufferPtr buf,
                               virDomainGraphicsSpiceChannelNameTypeToString(i),
                               virDomainGraphicsSpiceChannelModeTypeToString(mode));
         }
+        if (!children && (def->data.spice.image || def->data.spice.jpeg ||
+                          def->data.spice.zlib || def->data.spice.playback ||
+                          def->data.spice.streaming)) {
+            virBufferAddLit(buf, ">\n");
+            children = 1;
+        }
         if (def->data.spice.image)
             virBufferAsprintf(buf, "      <image compression='%s'/>\n",
                               virDomainGraphicsSpiceImageCompressionTypeToString(def->data.spice.image));