Pong, sorry, but was distracted with other things and I accumulated
feedback from different places on this issue, I would rather not have to
push 3 different patches to cover this :-)
I ended up with a rather similar but slightly more complex patch
(attached), the DTD may have to be loaded in other different conditions
wna while you apparently covered xmlIOParseDTD, one of the case I got
also pointed to xmlSAXParseDTD so both need to be fixed. Also I'm
doing an incremental bit fix rather than overwriting the full context
option which could also cause regressions.
I will also push separately an update to xmlInitParserCtxt() setting
up the options based on the global variable settings (it's evil but
needed for compatibility), but it's more of a cleanup than an actual
fix for the issue so not in that patch,
give it a try,
thanks,
Daniel
On Sun, Jun 08, 2014 at 06:31:57PM -0700, Alexey Neyman wrote:
> PING!
>
> On Tuesday, May 20, 2014 10:06:27 PM Alexey Neyman wrote:
> > [More investigation follows. Writing from a different machine, so cannot
> > reply to my own email]
> >
> > The issue, brief summary: upgrade of libxml2 from 2.7.6-14.el6 to
> > 2.7.6-14.el6_5.1 (RHEL6) broke the --postvalid/--dtdvalid options.
> >
> > Minimal test case:
> >
> > [a.xml]
> > <?xml version="1.0"?>
> > <!-- vi: set sw=2 : -->
> > <!DOCTYPE a SYSTEM "a.dtd">
> > <a>
> > <b/>
> > </a>
> >
> >
> > [a.dtd]
> > <!ELEMENT a (b|c)>
> > <!ENTITY % base.dtd SYSTEM "b.dtd">
> > %base.dtd;
> >
> >
> > [b.dtd]
> > <!ELEMENT b EMPTY>
> > <!ELEMENT c EMPTY>
> >
> > This command works:
> > xmllint --valid --noout --dtdvalid a.dtd a.xml
> >
> > This command doesn't:
> > xmllint --postvalid --noout --dtdvalid a.dtd a.xml
> > a.xml:5: element b: validity error : No declaration for element b
> > Document a.xml does not validate against a.dtd
> >
> > The problem:
> > 1. With --postvalid (and similarly treated options --dtdvalid,
> > --dtdvalidfpi) the XML_PARSE_DTDVALID is not set. Instead,
> > XML_PARSE_DTDLOAD is set (the validation is performed after loading of the
> > XML document). Solution: the
> > xmlParserHandlePEReference() should also check for XML_PARSE_DTDLOAD or the
> > parsed entities defined in the nested DTDs will not load.
> >
> > 2. Even with parsed entities loaded, the validation then fails: the
> > xmlParserHandlePEReference() is called during the post-validation with the
> > ctxt->options equal to zero when loading a separate DTD (e.g. due to
> > --dtdvalid option) via the xmlSAXParseDTD(). Solution: xmlSAXParseDTD()
> > should set the ctxt->options to XML_PARSE_DTDLOAD - after all,
> > xmlSAXParseDTD *is* loading the DTD.
> >
> > 3. The comment in the xmlParserHandlePEReference() is an obvious copy-paste:
> > it refers to parsed entities while the code actually handles parameter
> > entities. Solution: fix the comment :)
> >
> > Updated patch attached (against RHEL version of 2.7.6 - will update to git
> > version of libxml2 if needed).
> >
> > Regards,
> > Alexey.
>
> _______________________________________________
> xml mailing list, project page http://xmlsoft.org/
> xml@gnome.org
> https://mail.gnome.org/mailman/listinfo/xml
--
Daniel Veillard | Open Source and Standards, Red Hat
veill...@redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/
http://veillard.com/ | virtualization library http://libvirt.org/
diff --git a/parser.c b/parser.c
index c0dea05..1415151 100644
--- a/parser.c
+++ b/parser.c
@@ -2608,6 +2608,9 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
if ((entity->etype == XML_EXTERNAL_PARAMETER_ENTITY) &&
((ctxt->options & XML_PARSE_NOENT) == 0) &&
((ctxt->options & XML_PARSE_DTDVALID) == 0) &&
+ ((ctxt->options & XML_PARSE_DTDLOAD) == 0) &&
+ ((ctxt->options & XML_PARSE_DTDATTR) == 0) &&
+ (ctxt->replaceEntities == 0) &&
(ctxt->validate == 0))
return;
@@ -12616,6 +12619,9 @@ xmlIOParseDTD(xmlSAXHandlerPtr sax,
xmlParserInputBufferPtr input,
return(NULL);
}
+ /* We are loading a DTD */
+ ctxt->options |= XML_PARSE_DTDLOAD;
+
/*
* Set-up the SAX context
*/
@@ -12743,6 +12749,9 @@ xmlSAXParseDTD(xmlSAXHandlerPtr sax, const xmlChar
*ExternalID,
return(NULL);
}
+ /* We are loading a DTD */
+ ctxt->options |= XML_PARSE_DTDLOAD;
+
/*
* Set-up the SAX context
*/
_______________________________________________
xml mailing list, project page http://xmlsoft.org/
xml@gnome.org
https://mail.gnome.org/mailman/listinfo/xml
