summaryrefslogtreecommitdiff
path: root/result
diff options
context:
space:
mode:
authorNick Wellnhofer <wellnhofer@aevum.de>2022-11-15 18:23:33 +0100
committerNick Wellnhofer <wellnhofer@aevum.de>2022-11-20 21:27:08 +0100
commit68a6518c4523bf26751123dbb078d8ef5fef0ddc (patch)
treefc473564080b54428d0620c1ccad553c74006950 /result
parent2059df5358d978c0b891fc75d77c7e771a7cfcdc (diff)
downloadlibxml2-68a6518c4523bf26751123dbb078d8ef5fef0ddc.tar.gz
parser: Rewrite push parser boundary checks
Remove inaccurate xmlParseCheckTransition check. Remove non-incremental xmlParseGetLasts check. Add functions that check for several boundary constructs more accurately, keeping track of progress in ctxt->checkIndex. Fixes #439.
Diffstat (limited to 'result')
-rw-r--r--result/errors/754946.xml.str17
-rw-r--r--result/errors/759573-2.xml.str35
-rw-r--r--result/errors/759573.xml.str32
3 files changed, 75 insertions, 9 deletions
diff --git a/result/errors/754946.xml.str b/result/errors/754946.xml.str
index 49395b61..7aaf045b 100644
--- a/result/errors/754946.xml.str
+++ b/result/errors/754946.xml.str
@@ -1,4 +1,15 @@
-./test/errors/754946.xml:1: parser error : Extra content at the end of the document
-<!DOCTYPE A [
- ^
+./test/errors/754946.xml:3: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+
+ %SYSTEM;
+ ^
+Entity: line 1:
+A<lbbbbbbbbbbbbbbbbbbb_
+^
+./test/errors/754946.xml:4: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+
+ <![
+ ^
+./test/errors/754946.xml:4: parser error : DOCTYPE improperly terminated
+ <![
+ ^
./test/errors/754946.xml : failed to parse
diff --git a/result/errors/759573-2.xml.str b/result/errors/759573-2.xml.str
index baac1643..ff0cbdc2 100644
--- a/result/errors/759573-2.xml.str
+++ b/result/errors/759573-2.xml.str
@@ -1,4 +1,33 @@
-./test/errors/759573-2.xml:2: parser error : Extra content at the end of the document
-<!DOCTYPE test [
- ^
+Entity: line 1: parser error : Space required after '<!ENTITY'
+%zz;
+ ^
+Entity: line 1:
+<!ENTITY<?xDOCTYPEm~?>
+ ^
+Entity: line 1: parser error : xmlParseEntityDecl: no name
+%zz;
+ ^
+Entity: line 1:
+<!ENTITY<?xDOCTYPEm~?>
+ ^
+Entity: line 1: parser error : ParsePI: PI xDOCTYPEm space expected
+%zz;
+ ^
+Entity: line 1:
+<!ENTITY<?xDOCTYPEm~?>
+ ^
+./test/errors/759573-2.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+
+%xx;ÿggKENSMYNT&#35;MENTD&#372zz;'>
+ ^
+Entity: line 2:
+<![INCLUDE[
+ ^
+./test/errors/759573-2.xml:6: parser error : internal error: xmlParseInternalSubset: error detected in Markup declaration
+
+%xx;ÿggKENSMYNT&#35;MENTD&#372zz;'>
+ ^
+./test/errors/759573-2.xml:6: parser error : DOCTYPE improperly terminated
+%xx;ÿggKENSMYNT&#35;MENTD&#372zz;'>
+ ^
./test/errors/759573-2.xml : failed to parse
diff --git a/result/errors/759573.xml.str b/result/errors/759573.xml.str
index 1b6addb7..432f66b2 100644
--- a/result/errors/759573.xml.str
+++ b/result/errors/759573.xml.str
@@ -1,4 +1,30 @@
-./test/errors/759573.xml:1: parser error : Extra content at the end of the document
-<?h?><!DOCTYPEt[<!ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;00
- ^
+./test/errors/759573.xml:1: parser error : Space required after '<!ENTITY'
+ELEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITY
+ ^
+./test/errors/759573.xml:1: parser error : Space required after the entity name
+LEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz
+ ^
+./test/errors/759573.xml:1: parser error : Entity value required
+LEMENT t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz
+ ^
+./test/errors/759573.xml:1: parser error : PEReference: no name
+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
+
+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
+
+T t (A)><!ENTITY % xx '&#37;<![INCLUDE[000&#37;&#3000;000&#37;z;'><!ENTITYz>%xx;
+ ^
+./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;
+ ^
./test/errors/759573.xml : failed to parse