parser: Fix parsing of DTD content

nwellnhof · nwellnhof · commit ee1a43d4a5eb · 2025-03-01T15:58:23.000+01:00
Regressed in 2.11. Fixes #868.
diff --git a/parser.c b/parser.c
@@ -7153,7 +7153,11 @@ xmlParseMarkupDecl(xmlParserCtxtPtr ctxt) {
 		    xmlParseComment(ctxt);
 		    break;
 		default:
-		    /* there is an error but it will be detected later */
+                    xmlFatalErr(ctxt,
+                                ctxt->inSubset == 2 ?
+                                    XML_ERR_EXT_SUBSET_NOT_FINISHED :
+                                    XML_ERR_INT_SUBSET_NOT_FINISHED,
+                                NULL);
                     SKIP(2);
 		    break;
 	    }
diff --git a/result/errors/759573-2.xml.ent b/result/errors/759573-2.xml.ent
@@ -20,5 +20,11 @@ Entity: line 1:
 %xx;
     ^
 Entity: line 2: 
+<![INCLUDE[
+^
+./test/errors/759573-2.xml:6: parser error : Content error in the internal subset
+%xx;
+    ^
+Entity: line 2: 
 <![INCLUDE[
   ^
diff --git a/result/errors/759573-2.xml.err b/result/errors/759573-2.xml.err
@@ -20,5 +20,11 @@ Entity: line 1:
 %xx;
     ^
 Entity: line 2: 
+<![INCLUDE[
+^
+./test/errors/759573-2.xml:6: parser error : Content error in the internal subset
+%xx;
+    ^
+Entity: line 2: 
 <![INCLUDE[
   ^
diff --git a/result/errors/759573-2.xml.str b/result/errors/759573-2.xml.str
@@ -20,6 +20,12 @@ Entity: line 1:
 %xx;
     ^
 Entity: line 2: 
+<![INCLUDE[
+^
+./test/errors/759573-2.xml:6: parser error : Content error in the internal subset
+%xx;
+    ^
+Entity: line 2: 
 <![INCLUDE[
   ^
 ./test/errors/759573-2.xml : failed to parse
diff --git a/result/errors/759573.xml.ent b/result/errors/759573.xml.ent
@@ -17,5 +17,11 @@ Entity: line 1:
 T t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz>%xx;
                                                                                ^
 Entity: line 1: 
+%<![INCLUDE[000%ஸ000%z;
+ ^
+./test/errors/759573.xml:1: parser error : Content error in the internal subset
+T t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz>%xx;
+                                                                               ^
+Entity: line 1: 
 %<![INCLUDE[000%ஸ000%z;
    ^
diff --git a/result/errors/759573.xml.err b/result/errors/759573.xml.err
@@ -17,5 +17,11 @@ Entity: line 1:
 T t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz>%xx;
                                                                                ^
 Entity: line 1: 
+%<![INCLUDE[000%ஸ000%z;
+ ^
+./test/errors/759573.xml:1: parser error : Content error in the internal subset
+T t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz>%xx;
+                                                                               ^
+Entity: line 1: 
 %<![INCLUDE[000%ஸ000%z;
    ^
diff --git a/result/errors/759573.xml.str b/result/errors/759573.xml.str
@@ -17,6 +17,12 @@ Entity: line 1:
 T t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz>%xx;
                                                                                ^
 Entity: line 1: 
+%<![INCLUDE[000%ஸ000%z;
+ ^
+./test/errors/759573.xml:1: parser error : Content error in the internal subset
+T t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz>%xx;
+                                                                               ^
+Entity: line 1: 
 %<![INCLUDE[000%ஸ000%z;
    ^
 ./test/errors/759573.xml : failed to parse
diff --git a/result/errors/issue868.xml.ent b/result/errors/issue868.xml.ent
@@ -0,0 +1,3 @@
+./test/errors/issue868.xml:3: parser error : Content error in the internal subset
+<!]>
+^
diff --git a/result/errors/issue868.xml.err b/result/errors/issue868.xml.err
@@ -0,0 +1,3 @@
+./test/errors/issue868.xml:3: parser error : Content error in the internal subset
+<!]>
+^
diff --git a/result/errors/issue868.xml.str b/result/errors/issue868.xml.str
@@ -0,0 +1,4 @@
+./test/errors/issue868.xml:3: parser error : Content error in the internal subset
+<!]>
+^
+./test/errors/issue868.xml : failed to parse
diff --git a/test/errors/issue868.xml b/test/errors/issue868.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE rss [
+<!]>
+<rss>
+<channel>
+<image/>
+<title>PP</title>
+</channel>
+</rss>

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,11 @@ Entity: line 1:`
`20`	`20`	`%xx;`
`21`	`21`	`^`
`22`	`22`	`Entity: line 2:`
	`23`	`+<![INCLUDE[`
	`24`	`+^`
	`25`	`+./test/errors/759573-2.xml:6: parser error : Content error in the internal subset`
	`26`	`+%xx;`
	`27`	`+ ^`
	`28`	`+Entity: line 2:`
`23`	`29`	`<![INCLUDE[`
`24`	`30`	`^`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,12 @@ Entity: line 1:`
`20`	`20`	`%xx;`
`21`	`21`	`^`
`22`	`22`	`Entity: line 2:`
	`23`	`+<![INCLUDE[`
	`24`	`+^`
	`25`	`+./test/errors/759573-2.xml:6: parser error : Content error in the internal subset`
	`26`	`+%xx;`
	`27`	`+ ^`
	`28`	`+Entity: line 2:`
`23`	`29`	`<![INCLUDE[`
`24`	`30`	`^`
`25`	`31`	`./test/errors/759573-2.xml : failed to parse`
Original file line number	Diff line number	Diff line change
`@@ -17,5 +17,11 @@ Entity: line 1:`
`17`	`17`	`T t (A)><!ENTITY % xx '%<![INCLUDE[000%ஸ000%z;'><!ENTITYz>%xx;`
`18`	`18`	`^`
`19`	`19`	`Entity: line 1:`
	`20`	`+%<![INCLUDE[000%ஸ000%z;`
	`21`	`+ ^`
	`22`	`+./test/errors/759573.xml:1: parser error : Content error in the internal subset`
	`23`	`+T t (A)><!ENTITY % xx '%<![INCLUDE[000%ஸ000%z;'><!ENTITYz>%xx;`
	`24`	`+ ^`
	`25`	`+Entity: line 1:`
`20`	`26`	`%<![INCLUDE[000%ஸ000%z;`
`21`	`27`	`^`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,12 @@ Entity: line 1:`
`17`	`17`	`T t (A)><!ENTITY % xx '%<![INCLUDE[000%ஸ000%z;'><!ENTITYz>%xx;`
`18`	`18`	`^`
`19`	`19`	`Entity: line 1:`
	`20`	`+%<![INCLUDE[000%ஸ000%z;`
	`21`	`+ ^`
	`22`	`+./test/errors/759573.xml:1: parser error : Content error in the internal subset`
	`23`	`+T t (A)><!ENTITY % xx '%<![INCLUDE[000%ஸ000%z;'><!ENTITYz>%xx;`
	`24`	`+ ^`
	`25`	`+Entity: line 1:`
`20`	`26`	`%<![INCLUDE[000%ஸ000%z;`
`21`	`27`	`^`
`22`	`28`	`./test/errors/759573.xml : failed to parse`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+./test/errors/issue868.xml:3: parser error : Content error in the internal subset`
	`2`	`+<!]>`
	`3`	`+^`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +./test/errors/issue868.xml:3: parser error : Content error in the internal subset
 +<!]>
 +^
 +./test/errors/issue868.xml : failed to parse