Re: [libvirt] [PATCH 2/4] conf: Fix parsing python style triple quotes

An incorrect check broke matching the closing set of quotes. Update tests to cover this case for XM config files, and update the domain schema to allow more path characters. - <param name="pattern">/[a-zA-Z0-9_\.\+\-&amp;/%]*</param> + <param name="pattern">/[a-zA-Z0-9_\.\+\-\\&amp;&quot;&apos;&lt;&gt;/%]*</param>

</data> </define> <define name="devicePath"> <data type="string"> - <param name="pattern">/[a-zA-Z0-9_\+\-/%]+</param> + <param name="pattern">/[a-zA-Z0-9_\+\-\\&amp;&quot;&apos;&lt;&gt;/%]+</param>

</data> </define> <define name="deviceName"> <data type="string"> - <param name="pattern">[a-zA-Z0-9_\.\-:/]+</param> + <param name="pattern">[a-zA-Z0-9_\.\-\\&amp;&quot;&apos;&lt;&gt;:/]+</param>

+++ b/src/util/conf.c @@ -400,8 +400,9 @@ virConfParseString(virConfParserCtxtPtr ctxt) ctxt->cur += 3; base = ctxt->cur; + /* Find the ending triple quotes */ while ((ctxt->cur + 2 < ctxt->end) && - (STRPREFIX(ctxt->cur, "\"\"\""))) { + !(STRPREFIX(ctxt->cur, "\"\"\""))) {

+++ b/tests/xmconfigdata/test-escape-paths.cfg @@ -19,7 +19,7 @@ vnc = 1 vncunused = 1 vnclisten = "127.0.0.1" vncpasswd = "123poi" -disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso&test,hdc:cdrom,r" ] +disk = [ "phy:/dev/HostVG/XenGuest2,hda,w", "file:/root/boot.iso&test,hdc:cdrom,r", """phy:/dev/HostVG/XenGuest'",hdb,w""" ] vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,model=e1000,type=ioemu" ] parallel = "none" serial = "none" diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml index dabf492..13e6e29 100644 --- a/tests/xmconfigdata/test-escape-paths.xml +++ b/tests/xmconfigdata/test-escape-paths.xml @@ -31,6 +31,11 @@ <target dev='hdc' bus='ide'/> <readonly/> </disk> + <disk type='block' device='disk'> + <driver name='phy'/> + <source dev='/dev/HostVG/XenGuest&apos;&quot;'/>