diff --git a/parser.c b/parser.c index 7b386fe3..57e03fc0 100644 --- a/parser.c +++ b/parser.c @@ -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))) { diff --git a/python/tests/tstLastError.py b/python/tests/tstLastError.py index 902a7cb8..64eceac7 100755 --- a/python/tests/tstLastError.py +++ b/python/tests/tstLastError.py @@ -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) diff --git a/result/VC/PENesting b/result/VC/PENesting index 966689ae..705e24c3 100644 --- a/result/VC/PENesting +++ b/result/VC/PENesting @@ -1,6 +1,3 @@ ./test/VC/PENesting:1: parser error : StartTag: invalid element name "> ^ -./test/VC/PENesting:1: parser error : Extra content at the end of the document - "> - ^ diff --git a/result/VC/PENesting2 b/result/VC/PENesting2 index c53ead6a..f1388270 100644 --- a/result/VC/PENesting2 +++ b/result/VC/PENesting2 @@ -1,6 +1,3 @@ ./test/VC/PENesting2:1: parser error : StartTag: invalid element name ^ -./test/VC/PENesting2:1: parser error : Extra content at the end of the document - - ^ diff --git a/result/errors/754947.xml.ent b/result/errors/754947.xml.ent index 1ea73d13..372248b5 100644 --- a/result/errors/754947.xml.ent +++ b/result/errors/754947.xml.ent @@ -2,6 +2,3 @@ Bytes: 0xEE 0x5D 0x5D 0x3E ^ -./test/errors/759398.xml:316: parser error : Extra content at the end of the document - -^ diff --git a/result/errors/759398.xml.err b/result/errors/759398.xml.err index f6036a3b..c3f4df41 100644 --- a/result/errors/759398.xml.err +++ b/result/errors/759398.xml.err @@ -7,6 +7,3 @@ and provide access to their content and structure. ^ -./test/errors/759398.xml:316: parser error : Extra content at the end of the document - -^ diff --git a/result/errors/attr4.xml.ent b/result/errors/attr4.xml.ent index a9966d85..89906a1b 100644 --- a/result/errors/attr4.xml.ent +++ b/result/errors/attr4.xml.ent @@ -7,6 +7,3 @@ ./test/errors/attr4.xml:1: parser error : Couldn't find end of Start Tag ROOT line 1 ^ -./test/errors/attr4.xml:1: parser error : Extra content at the end of the document - - ^ diff --git a/result/errors/attr4.xml.err b/result/errors/attr4.xml.err index a9966d85..89906a1b 100644 --- a/result/errors/attr4.xml.err +++ b/result/errors/attr4.xml.err @@ -7,6 +7,3 @@ ./test/errors/attr4.xml:1: parser error : Couldn't find end of Start Tag ROOT line 1 ^ -./test/errors/attr4.xml:1: parser error : Extra content at the end of the document - - ^ diff --git a/result/errors/trailing-null-1.xml.ent b/result/errors/trailing-null-1.xml.ent new file mode 100644 index 00000000..193a77a3 --- /dev/null +++ b/result/errors/trailing-null-1.xml.ent @@ -0,0 +1,3 @@ +./test/errors/trailing-null-1.xml:1: parser error : Extra content at the end of the document + + ^ diff --git a/result/errors/trailing-null-1.xml.err b/result/errors/trailing-null-1.xml.err new file mode 100644 index 00000000..193a77a3 --- /dev/null +++ b/result/errors/trailing-null-1.xml.err @@ -0,0 +1,3 @@ +./test/errors/trailing-null-1.xml:1: parser error : Extra content at the end of the document + + ^ diff --git a/result/errors/trailing-null-1.xml.str b/result/errors/trailing-null-1.xml.str new file mode 100644 index 00000000..09fab376 --- /dev/null +++ b/result/errors/trailing-null-1.xml.str @@ -0,0 +1,4 @@ +./test/errors/trailing-null-1.xml:1: parser error : Extra content at the end of the document + + ^ +./test/errors/trailing-null-1.xml : failed to parse diff --git a/result/errors/trailing-null-2.xml.ent b/result/errors/trailing-null-2.xml.ent new file mode 100644 index 00000000..fcc5259b --- /dev/null +++ b/result/errors/trailing-null-2.xml.ent @@ -0,0 +1,6 @@ +./test/errors/trailing-null-2.xml:1: parser error : Char 0x0 out of allowed range + + ^ +./test/errors/trailing-null-2.xml:1: parser error : PCDATA invalid Char value 0 + + ^ diff --git a/result/errors/trailing-null-2.xml.err b/result/errors/trailing-null-2.xml.err new file mode 100644 index 00000000..fcc5259b --- /dev/null +++ b/result/errors/trailing-null-2.xml.err @@ -0,0 +1,6 @@ +./test/errors/trailing-null-2.xml:1: parser error : Char 0x0 out of allowed range + + ^ +./test/errors/trailing-null-2.xml:1: parser error : PCDATA invalid Char value 0 + + ^ diff --git a/result/errors/trailing-null-2.xml.str b/result/errors/trailing-null-2.xml.str new file mode 100644 index 00000000..b8139ea1 --- /dev/null +++ b/result/errors/trailing-null-2.xml.str @@ -0,0 +1,7 @@ +./test/errors/trailing-null-2.xml:1: parser error : Char 0x0 out of allowed range + + ^ +./test/errors/trailing-null-2.xml:1: parser error : PCDATA invalid Char value 0 + + ^ +./test/errors/trailing-null-2.xml : failed to parse diff --git a/result/errors/utf8-1.xml.ent b/result/errors/utf8-1.xml.ent index 35d84980..9ce2b93d 100644 --- a/result/errors/utf8-1.xml.ent +++ b/result/errors/utf8-1.xml.ent @@ -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 - -^ diff --git a/result/errors/utf8-1.xml.err b/result/errors/utf8-1.xml.err index 35d84980..9ce2b93d 100644 --- a/result/errors/utf8-1.xml.err +++ b/result/errors/utf8-1.xml.err @@ -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 - -^ diff --git a/result/errors/utf8-2.xml.ent b/result/errors/utf8-2.xml.ent index 1631d664..c0e17220 100644 --- a/result/errors/utf8-2.xml.ent +++ b/result/errors/utf8-2.xml.ent @@ -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 - -^ diff --git a/result/errors/utf8-2.xml.err b/result/errors/utf8-2.xml.err index 1631d664..c0e17220 100644 --- a/result/errors/utf8-2.xml.err +++ b/result/errors/utf8-2.xml.err @@ -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 - -^ diff --git a/result/valid/t4.dtd.err b/result/valid/t4.dtd.err index 23a32588..d4576e3b 100644 --- a/result/valid/t4.dtd.err +++ b/result/valid/t4.dtd.err @@ -1,6 +1,3 @@ ./test/valid/t4.dtd:1: parser error : StartTag: invalid element name ^ -./test/valid/t4.dtd:1: parser error : Extra content at the end of the document - - ^ diff --git a/result/valid/t4a.dtd.err b/result/valid/t4a.dtd.err index 48cdd5f9..38db989d 100644 --- a/result/valid/t4a.dtd.err +++ b/result/valid/t4a.dtd.err @@ -1,6 +1,3 @@ ./test/valid/t4a.dtd:1: parser error : StartTag: invalid element name ^ -./test/valid/t4a.dtd:1: parser error : Extra content at the end of the document - - ^ diff --git a/result/valid/t6.dtd.err b/result/valid/t6.dtd.err index 6e84d68a..487c07dc 100644 --- a/result/valid/t6.dtd.err +++ b/result/valid/t6.dtd.err @@ -1,6 +1,3 @@ ./test/valid/t6.dtd:1: parser error : StartTag: invalid element name ^ -./test/valid/t6.dtd:1: parser error : Extra content at the end of the document - - ^ diff --git a/test/errors/trailing-null-1.xml b/test/errors/trailing-null-1.xml new file mode 100644 index 00000000..de7334d9 Binary files /dev/null and b/test/errors/trailing-null-1.xml differ diff --git a/test/errors/trailing-null-2.xml b/test/errors/trailing-null-2.xml new file mode 100644 index 00000000..3bfffd6d Binary files /dev/null and b/test/errors/trailing-null-2.xml differ