c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

parser: Fix detection of null bytes

Browse Source 
Also suppress misleading extra errors.

Fixes #122.
This commit is contained in:
Nick Wellnhofer 2023-08-29 15:56:37 +02:00
parent c6083a32d6
commit bbd918b2e7
25 changed files with 51 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
parser.c
View File

@ -9553,7 +9553,7 @@ xmlParseContentInternal(xmlParserCtxtPtr ctxt) {
int nameNr = ctxt->nameNr;
GROW;
while ((RAW != 0) &&
while ((ctxt->input->cur < ctxt->input->end) &&
(ctxt->instate != XML_PARSER_EOF)) {
const xmlChar *cur = ctxt->input->cur;
@ -9630,7 +9630,9 @@ xmlParseContent(xmlParserCtxtPtr ctxt) {
xmlParseContentInternal(ctxt);
if ((ctxt->instate != XML_PARSER_EOF) && (ctxt->nameNr > nameNr)) {
if ((ctxt->instate != XML_PARSER_EOF) &&
(ctxt->errNo == XML_ERR_OK) &&
(ctxt->nameNr > nameNr)) {
const xmlChar *name = ctxt->nameTab[ctxt->nameNr - 1];
int line = ctxt->pushTab[ctxt->nameNr - 1].line;
xmlFatalErrMsgStrIntStr(ctxt, XML_ERR_TAG_NOT_FINISHED,
@ -9664,12 +9666,14 @@ xmlParseElement(xmlParserCtxtPtr ctxt) {
if (ctxt->instate == XML_PARSER_EOF)
return;
if (CUR == 0) {
const xmlChar *name = ctxt->nameTab[ctxt->nameNr - 1];
int line = ctxt->pushTab[ctxt->nameNr - 1].line;
xmlFatalErrMsgStrIntStr(ctxt, XML_ERR_TAG_NOT_FINISHED,
"Premature end of data in tag %s line %d\n",
name, line, NULL);
if (ctxt->input->cur >= ctxt->input->end) {
if (ctxt->errNo == XML_ERR_OK) {
const xmlChar *name = ctxt->nameTab[ctxt->nameNr - 1];
int line = ctxt->pushTab[ctxt->nameNr - 1].line;
xmlFatalErrMsgStrIntStr(ctxt, XML_ERR_TAG_NOT_FINISHED,
"Premature end of data in tag %s line %d\n",
name, line, NULL);
}
return;
}
@ -10448,8 +10452,9 @@ xmlParseDocument(xmlParserCtxtPtr ctxt) {
*/
xmlParseMisc(ctxt);
if (RAW != 0) {
xmlFatalErr(ctxt, XML_ERR_DOCUMENT_END, NULL);
if (ctxt->input->cur < ctxt->input->end) {
if (ctxt->errNo == XML_ERR_OK)
xmlFatalErr(ctxt, XML_ERR_DOCUMENT_END, NULL);
} else if ((ctxt->input->buf != NULL) &&
(ctxt->input->buf->encoder != NULL) &&
(!xmlBufIsEmpty(ctxt->input->buf->raw))) {
@ -11394,7 +11399,8 @@ xmlParseTryOrFinish(xmlParserCtxtPtr ctxt, int terminate) {
}
if (ctxt->instate == XML_PARSER_EPILOG) {
xmlFatalErr(ctxt, XML_ERR_DOCUMENT_END, NULL);
if (ctxt->errNo == XML_ERR_OK)
xmlFatalErr(ctxt, XML_ERR_DOCUMENT_END, NULL);
ctxt->instate = XML_PARSER_EOF;
if ((ctxt->sax) && (ctxt->sax->endDocument != NULL))
ctxt->sax->endDocument(ctxt->userData);
@ -11526,13 +11532,9 @@ xmlParseChunk(xmlParserCtxtPtr ctxt, const char *chunk, int size,
/*
* Check for termination
*/
if ((ctxt->instate != XML_PARSER_EOF) &&
(ctxt->instate != XML_PARSER_EPILOG)) {
xmlFatalErr(ctxt, XML_ERR_DOCUMENT_END, NULL);
}
if ((ctxt->instate == XML_PARSER_EPILOG) &&
(ctxt->input->cur < ctxt->input->end)) {
xmlFatalErr(ctxt, XML_ERR_DOCUMENT_END, NULL);
if (ctxt->input->cur < ctxt->input->end) {
if (ctxt->errNo == XML_ERR_OK)
xmlFatalErr(ctxt, XML_ERR_DOCUMENT_END, NULL);
} else if ((ctxt->input->buf != NULL) &&
(ctxt->input->buf->encoder != NULL) &&
(!xmlBufIsEmpty(ctxt->input->buf->raw))) {

4
python/tests/tstLastError.py
View File

@ -71,8 +71,8 @@ class TestCase(unittest.TestCase):
(s,len(s),"dummy.xml",None,0),
libxml2.treeError,
domain=libxml2.XML_FROM_PARSER,
code=libxml2.XML_ERR_TAG_NOT_FINISHED,
message='Premature end of data in tag x line 1\n',
code=libxml2.XML_ERR_TAG_NAME_MISMATCH,
message='Opening and ending tag mismatch: a line 2 and x\n',
level=libxml2.XML_ERR_FATAL,
file='dummy.xml',
line=3)

3
result/VC/PENesting
View File

@ -1,6 +1,3 @@
./test/VC/PENesting:1: parser error : StartTag: invalid element name
<!ENTITY % pe1 "EMPTY> <!ELEMENT e2 EMPTY>">
^
./test/VC/PENesting:1: parser error : Extra content at the end of the document
<!ENTITY % pe1 "EMPTY> <!ELEMENT e2 EMPTY>">
^

3
result/VC/PENesting2
View File

@ -1,6 +1,3 @@
./test/VC/PENesting2:1: parser error : StartTag: invalid element name
<!ENTITY % p1 "(A|B">
^
./test/VC/PENesting2:1: parser error : Extra content at the end of the document
<!ENTITY % p1 "(A|B">
^

3
result/errors/754947.xml.ent
View File

@ -2,6 +2,3 @@
Bytes: 0xEE 0x5D 0x5D 0x3E
<d><![CDATA[0000000000000
^
./test/errors/754947.xml:1: parser error : Premature end of data in tag d line 1
<d><![CDATA[0000000000000
^

3
result/errors/754947.xml.err
View File

@ -2,6 +2,3 @@
Bytes: 0xEE 0x5D 0x5D 0x3E
<d><![CDATA[0000000000000
^
./test/errors/754947.xml:1: parser error : Premature end of data in tag d line 1
<d><![CDATA[0000000000000
^

3
result/errors/759398.xml.ent
View File

@ -7,6 +7,3 @@ and provide access to their content and structure.</termdef> <termdef
./test/errors/759398.xml:314: parser error : Opening and ending tag mismatch: spec line 50 and p
data and the information it must provide to the application.</p>
^
./test/errors/759398.xml:316: parser error : Extra content at the end of the document
<div2 id='sec-origin-goals'>
^

3
result/errors/759398.xml.err
View File

@ -7,6 +7,3 @@ and provide access to their content and structure.</termdef> <termdef
./test/errors/759398.xml:314: parser error : Opening and ending tag mismatch: spec line 50 and p
data and the information it must provide to the application.</p>
^
./test/errors/759398.xml:316: parser error : Extra content at the end of the document
<div2 id='sec-origin-goals'>
^

3
result/errors/attr4.xml.ent
View File

@ -7,6 +7,3 @@
./test/errors/attr4.xml:1: parser error : Couldn't find end of Start Tag ROOT line 1
<ROOT attr="XY"/>
^
./test/errors/attr4.xml:1: parser error : Extra content at the end of the document
<ROOT attr="XY"/>
^

3
result/errors/attr4.xml.err
View File

@ -7,6 +7,3 @@
./test/errors/attr4.xml:1: parser error : Couldn't find end of Start Tag ROOT line 1
<ROOT attr="XY"/>
^
./test/errors/attr4.xml:1: parser error : Extra content at the end of the document
<ROOT attr="XY"/>
^

3
result/errors/trailing-null-1.xml.ent Normal file
View File

@ -0,0 +1,3 @@
./test/errors/trailing-null-1.xml:1: parser error : Extra content at the end of the document
<d/>
^

3
result/errors/trailing-null-1.xml.err Normal file
View File

@ -0,0 +1,3 @@
./test/errors/trailing-null-1.xml:1: parser error : Extra content at the end of the document
<d/>
^

4
result/errors/trailing-null-1.xml.str Normal file
View File

@ -0,0 +1,4 @@
./test/errors/trailing-null-1.xml:1: parser error : Extra content at the end of the document
<d/>
^
./test/errors/trailing-null-1.xml : failed to parse

6
result/errors/trailing-null-2.xml.ent Normal file
View File

@ -0,0 +1,6 @@
./test/errors/trailing-null-2.xml:1: parser error : Char 0x0 out of allowed range
<d>
^
./test/errors/trailing-null-2.xml:1: parser error : PCDATA invalid Char value 0
<d>
^

6
result/errors/trailing-null-2.xml.err Normal file
View File

@ -0,0 +1,6 @@
./test/errors/trailing-null-2.xml:1: parser error : Char 0x0 out of allowed range
<d>
^
./test/errors/trailing-null-2.xml:1: parser error : PCDATA invalid Char value 0
<d>
^

7
result/errors/trailing-null-2.xml.str Normal file
View File

@ -0,0 +1,7 @@
./test/errors/trailing-null-2.xml:1: parser error : Char 0x0 out of allowed range
<d>
^
./test/errors/trailing-null-2.xml:1: parser error : PCDATA invalid Char value 0
<d>
^
./test/errors/trailing-null-2.xml : failed to parse

3
result/errors/utf8-1.xml.ent
View File

@ -4,6 +4,3 @@
./test/errors/utf8-1.xml:1: parser error : StartTag: invalid element name
..............................................................................<<
^
./test/errors/utf8-1.xml:2: parser error : Premature end of data in tag d line 1
^

3
result/errors/utf8-1.xml.err
View File

@ -4,6 +4,3 @@
./test/errors/utf8-1.xml:1: parser error : StartTag: invalid element name
..............................................................................<<
^
./test/errors/utf8-1.xml:2: parser error : Premature end of data in tag d line 1
^

3
result/errors/utf8-2.xml.ent
View File

@ -4,6 +4,3 @@
./test/errors/utf8-2.xml:2: parser error : Couldn't find end of Start Tag €€€€€€€€€€€€€€€€€€€€€€€€€ line 1
^
./test/errors/utf8-2.xml:2: parser error : Premature end of data in tag d line 1
^

3
result/errors/utf8-2.xml.err
View File

@ -4,6 +4,3 @@
./test/errors/utf8-2.xml:2: parser error : Couldn't find end of Start Tag €€€€€€€€€€€€€€€€€€€€€€€€€ line 1
^
./test/errors/utf8-2.xml:2: parser error : Premature end of data in tag d line 1
^

3
result/valid/t4.dtd.err
View File

@ -1,6 +1,3 @@
./test/valid/t4.dtd:1: parser error : StartTag: invalid element name
<!ENTITY % percent "&#x25;">
^
./test/valid/t4.dtd:1: parser error : Extra content at the end of the document
<!ENTITY % percent "&#x25;">
^

3
result/valid/t4a.dtd.err
View File

@ -1,6 +1,3 @@
./test/valid/t4a.dtd:1: parser error : StartTag: invalid element name
<!ENTITY % percent "&#x25;">
^
./test/valid/t4a.dtd:1: parser error : Extra content at the end of the document
<!ENTITY % percent "&#x25;">
^

3
result/valid/t6.dtd.err
View File

@ -1,6 +1,3 @@
./test/valid/t6.dtd:1: parser error : StartTag: invalid element name
<!ENTITY % xdef "def">
^
./test/valid/t6.dtd:1: parser error : Extra content at the end of the document
<!ENTITY % xdef "def">
^

BIN
test/errors/trailing-null-1.xml Normal file
View File

Binary file not shown.

BIN
test/errors/trailing-null-2.xml Normal file
View File

Binary file not shown.