parser: Fix loading of parameter entities in external DTDs

nwellnhof · nwellnhof · commit 5cce7af791fb · 2024-11-12T16:35:58.000+01:00
Regressed with commit 12f0bb9. Fixes #816.
diff --git a/parser.c b/parser.c
@@ -11833,6 +11833,7 @@ xmlIOParseDTD(xmlSAXHandlerPtr sax, xmlParserInputBufferPtr input,
         xmlFreeParserInputBuffer(input);
 	return(NULL);
     }
+    xmlCtxtSetOptions(ctxt, XML_PARSE_DTDLOAD);
 
     /*
      * generate a parser input from the I/O handler
@@ -11922,6 +11923,7 @@ xmlSAXParseDTD(xmlSAXHandlerPtr sax, const xmlChar *ExternalID,
     if (ctxt == NULL) {
 	return(NULL);
     }
+    xmlCtxtSetOptions(ctxt, XML_PARSE_DTDLOAD);
 
     /*
      * Canonicalise the system ID

Original file line number	Diff line number	Diff line change
`@@ -11833,6 +11833,7 @@ xmlIOParseDTD(xmlSAXHandlerPtr sax, xmlParserInputBufferPtr input,`
`11833`	`11833`	`xmlFreeParserInputBuffer(input);`
`11834`	`11834`	`return(NULL);`
`11835`	`11835`	`}`
	`11836`	`+ xmlCtxtSetOptions(ctxt, XML_PARSE_DTDLOAD);`
`11836`	`11837`
`11837`	`11838`	`/*`
`11838`	`11839`	`* generate a parser input from the I/O handler`
`@@ -11922,6 +11923,7 @@ xmlSAXParseDTD(xmlSAXHandlerPtr sax, const xmlChar *ExternalID,`
`11922`	`11923`	`if (ctxt == NULL) {`
`11923`	`11924`	`return(NULL);`
`11924`	`11925`	`}`
	`11926`	`+ xmlCtxtSetOptions(ctxt, XML_PARSE_DTDLOAD);`
`11925`	`11927`
`11926`	`11928`	`/*`
`11927`	`11929`	`* Canonicalise the system ID`