parser: Fix parsing of DTD content

Regressed in 2.11. Fixes #868.
2025-03-27 18:50:07 +03:00 · 2025-03-01 10:25:29 +01:00 · 2025-03-01 10:25:29 +01:00 · 1e3fd2677a
commit 1e3fd2677a
parent 02d577715e
11 changed files with 60 additions and 1 deletions
--- a/parser.c
+++ b/parser.c
@ -7040,7 +7040,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_DOCTYPE_NOT_FINISHED,
+                                NULL);
                    SKIP(2);
 		    break;
 	    }
--- a/result/errors/759573-2.xml.ent
+++ b/result/errors/759573-2.xml.ent
@ -16,6 +16,12 @@ Entity: line 1: parser error : ParsePI: PI xDOCTYPEm space expected
 Entity: line 1: 
 <!ENTITY<?xDOCTYPEm~?>
                   ^
+./test/errors/759573-2.xml:6: parser error : DOCTYPE improperly terminated
+%xx;
+    ^
+Entity: line 2: 
+<![INCLUDE[
+^
 ./test/errors/759573-2.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration

 %xx;
--- a/result/errors/759573-2.xml.err
+++ b/result/errors/759573-2.xml.err
@ -16,6 +16,12 @@ Entity: line 1: parser error : ParsePI: PI xDOCTYPEm space expected
 Entity: line 1: 
 <!ENTITY<?xDOCTYPEm~?>
                   ^
+./test/errors/759573-2.xml:6: parser error : DOCTYPE improperly terminated
+%xx;
+    ^
+Entity: line 2: 
+<![INCLUDE[
+^
 ./test/errors/759573-2.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration

 %xx;
--- a/result/errors/759573-2.xml.str
+++ b/result/errors/759573-2.xml.str
@ -16,6 +16,12 @@ Entity: line 1: parser error : ParsePI: PI xDOCTYPEm space expected
 Entity: line 1: 
 <!ENTITY<?xDOCTYPEm~?>
                   ^
+./test/errors/759573-2.xml:6: parser error : DOCTYPE improperly terminated
+%xx;
+    ^
+Entity: line 2: 
+<![INCLUDE[
+^
 ./test/errors/759573-2.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration

 %xx;
--- a/result/errors/759573.xml.ent
+++ b/result/errors/759573.xml.ent
@ -11,6 +11,12 @@ LEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz
 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 : DOCTYPE improperly terminated
+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 : internal error: xmlParseInternalSubset: error detected in Markup declaration
--- a/result/errors/759573.xml.err
+++ b/result/errors/759573.xml.err
@ -11,6 +11,12 @@ LEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz
 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 : DOCTYPE improperly terminated
+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 : internal error: xmlParseInternalSubset: error detected in Markup declaration
--- a/result/errors/759573.xml.str
+++ b/result/errors/759573.xml.str
@ -11,6 +11,12 @@ LEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz
 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 : DOCTYPE improperly terminated
+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 : internal error: xmlParseInternalSubset: error detected in Markup declaration
--- a/result/errors/issue868.xml.ent
+++ b/result/errors/issue868.xml.ent
@ -0,0 +1,3 @@
+./test/errors/issue868.xml:3: parser error : DOCTYPE improperly terminated
+<!]>
+^
--- a/result/errors/issue868.xml.err
+++ b/result/errors/issue868.xml.err
@ -0,0 +1,3 @@
+./test/errors/issue868.xml:3: parser error : DOCTYPE improperly terminated
+<!]>
+^
--- a/result/errors/issue868.xml.str
+++ b/result/errors/issue868.xml.str
@ -0,0 +1,4 @@
+./test/errors/issue868.xml:3: parser error : DOCTYPE improperly terminated
+<!]>
+^
+./test/errors/issue868.xml : failed to parse
--- 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>