fixed my mis-handling of External ID on last change.
* valid.c: fixed my mis-handling of External ID on last
change.
diff --git a/ChangeLog b/ChangeLog
index 218773d..081796a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 6 09:22:34 PDT 2004 William Brack <wbrack@mmm.com.hk>
+
+ * valid.c: fixed my mis-handling of External ID on last
+ change.
+
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
diff --git a/valid.c b/valid.c
index 1844ad2..ade90dd 100644
--- a/valid.c
+++ b/valid.c
@@ -6502,21 +6502,20 @@
}
if ((doc->intSubset != NULL) && ((doc->intSubset->SystemID != NULL) ||
(doc->intSubset->ExternalID != NULL)) && (doc->extSubset == NULL)) {
- xmlChar *extID, *sysID;
- if (doc->intSubset->ExternalID != NULL)
- extID = xmlBuildURI(doc->intSubset->ExternalID,
- doc->URL);
- else
- extID = NULL;
- if (doc->intSubset->SystemID != NULL)
+ xmlChar *sysID;
+ if (doc->intSubset->SystemID != NULL) {
sysID = xmlBuildURI(doc->intSubset->SystemID,
doc->URL);
- else
+ if (sysID == NULL) {
+ xmlErrValid(ctxt, XML_DTD_LOAD_ERROR,
+ "Could not build URI for external subset \"%s\"\n",
+ (const char *) doc->intSubset->SystemID);
+ return 0;
+ }
+ } else
sysID = NULL;
- doc->extSubset = xmlParseDTD((const xmlChar *)extID,
+ doc->extSubset = xmlParseDTD(doc->intSubset->ExternalID,
(const xmlChar *)sysID);
- if (extID != NULL)
- xmlFree(extID);
if (sysID != NULL)
xmlFree(sysID);
if (doc->extSubset == NULL) {