Commit bebe730b authored by William M. Brack's avatar William M. Brack
Browse files

changed the parsing of a document's DTD to use the proper base path (bug

* valid.c: changed the parsing of a document's DTD to use
  the proper base path (bug 144366)
parent d392ba7e
Wed Aug 4 23:40:21 PDT 2004 William Brack <wbrack@mmm.com.hk>
* valid.c: changed the parsing of a document's DTD to use
the proper base path (bug 144366)
Wed Aug 4 16:58:08 CEST 2004 Daniel Veillard <daniel@veillard.com>
 
* Makefile.am config.h.in configure.in python/Makefile.am:
......
......@@ -6502,8 +6502,23 @@ xmlValidateDocument(xmlValidCtxtPtr ctxt, xmlDocPtr doc) {
}
if ((doc->intSubset != NULL) && ((doc->intSubset->SystemID != NULL) ||
(doc->intSubset->ExternalID != NULL)) && (doc->extSubset == NULL)) {
doc->extSubset = xmlParseDTD(doc->intSubset->ExternalID,
doc->intSubset->SystemID);
xmlChar *extID, *sysID;
if (doc->intSubset->ExternalID != NULL)
extID = xmlBuildURI(doc->intSubset->ExternalID,
doc->URL);
else
extID = NULL;
if (doc->intSubset->SystemID != NULL)
sysID = xmlBuildURI(doc->intSubset->SystemID,
doc->URL);
else
sysID = NULL;
doc->extSubset = xmlParseDTD((const xmlChar *)extID,
(const xmlChar *)sysID);
if (extID != NULL)
xmlFree(extID);
if (sysID != NULL)
xmlFree(sysID);
if (doc->extSubset == NULL) {
if (doc->intSubset->SystemID != NULL) {
xmlErrValid(ctxt, XML_DTD_LOAD_ERROR,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment