unlinked the internal subset within xmlValidateDtd (bug 141827) added
* valid.c: unlinked the internal subset within xmlValidateDtd
(bug 141827)
* configure.in: added -Wall to developer's flags
* doc/examples/reader4.res: added to CVS
diff --git a/valid.c b/valid.c
index 6b2d08e..2ce83b1 100644
--- a/valid.c
+++ b/valid.c
@@ -6304,7 +6304,10 @@
*
* Try to validate the document against the dtd instance
*
- * basically it does check all the definitions in the DtD.
+ * Basically it does check all the definitions in the DtD.
+ * Note the the internal subset (if present) is de-coupled
+ * (i.e. not used), which could give problems if ID or IDREF
+ * is present.
*
* returns 1 if valid or 0 otherwise
*/
@@ -6312,16 +6315,19 @@
int
xmlValidateDtd(xmlValidCtxtPtr ctxt, xmlDocPtr doc, xmlDtdPtr dtd) {
int ret;
- xmlDtdPtr oldExt;
+ xmlDtdPtr oldExt, oldInt;
xmlNodePtr root;
if (dtd == NULL) return(0);
if (doc == NULL) return(0);
oldExt = doc->extSubset;
+ oldInt = doc->intSubset;
doc->extSubset = dtd;
+ doc->intSubset = NULL;
ret = xmlValidateRoot(ctxt, doc);
if (ret == 0) {
doc->extSubset = oldExt;
+ doc->intSubset = oldInt;
return(ret);
}
if (doc->ids != NULL) {
@@ -6336,6 +6342,7 @@
ret = xmlValidateElement(ctxt, doc, root);
ret &= xmlValidateDocumentFinal(ctxt, doc);
doc->extSubset = oldExt;
+ doc->intSubset = oldInt;
return(ret);
}