From 85c112a0828a13aadf9fa806a38dfb185e1ddd4c Mon Sep 17 00:00:00 2001 From: David Kilzer Date: Mon, 12 Jun 2017 18:26:11 +0200 Subject: [PATCH] Add test cases for bug 758518 test/HTML/758518-entity.html exposed a bug in pushParseTest() in runtest.c which assumed that an input file was at least 4 bytes long. That test case is only 3 bytes, so we now take the minimum of 4 bytes or the length of the test input. We also now use 'chunkSize' in place of the hard-coded value '1024' later in the function. --- result/HTML/758518-entity.html | 2 ++ result/HTML/758518-entity.html.err | 3 +++ result/HTML/758518-entity.html.sax | 12 ++++++++++++ result/HTML/758518-tag.html | 2 ++ result/HTML/758518-tag.html.err | 3 +++ result/HTML/758518-tag.html.sax | 10 ++++++++++ runtest.c | 19 ++++++++++++------- test/HTML/758518-entity.html | 1 + test/HTML/758518-tag.html | 1 + 9 files changed, 46 insertions(+), 7 deletions(-) create mode 100644 result/HTML/758518-entity.html create mode 100644 result/HTML/758518-entity.html.err create mode 100644 result/HTML/758518-entity.html.sax create mode 100644 result/HTML/758518-tag.html create mode 100644 result/HTML/758518-tag.html.err create mode 100644 result/HTML/758518-tag.html.sax create mode 100644 test/HTML/758518-entity.html create mode 100644 test/HTML/758518-tag.html diff --git a/result/HTML/758518-entity.html b/result/HTML/758518-entity.html new file mode 100644 index 00000000..e72b0cbd --- /dev/null +++ b/result/HTML/758518-entity.html @@ -0,0 +1,2 @@ + +

&Ù

diff --git a/result/HTML/758518-entity.html.err b/result/HTML/758518-entity.html.err new file mode 100644 index 00000000..0186677b --- /dev/null +++ b/result/HTML/758518-entity.html.err @@ -0,0 +1,3 @@ +./test/HTML/758518-entity.html:1: HTML parser error : htmlParseEntityRef: expecting ';' +Ù + ^ diff --git a/result/HTML/758518-entity.html.sax b/result/HTML/758518-entity.html.sax new file mode 100644 index 00000000..3d017ab2 --- /dev/null +++ b/result/HTML/758518-entity.html.sax @@ -0,0 +1,12 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.error: htmlParseEntityRef: expecting ';' +SAX.startElement(html) +SAX.startElement(body) +SAX.startElement(p) +SAX.characters(&, 1) +SAX.characters(Ù, 2) +SAX.endElement(p) +SAX.endElement(body) +SAX.endElement(html) +SAX.endDocument() diff --git a/result/HTML/758518-tag.html b/result/HTML/758518-tag.html new file mode 100644 index 00000000..f99f4211 --- /dev/null +++ b/result/HTML/758518-tag.html @@ -0,0 +1,2 @@ + +

“

diff --git a/result/HTML/758518-tag.html.err b/result/HTML/758518-tag.html.err new file mode 100644 index 00000000..c912c91f --- /dev/null +++ b/result/HTML/758518-tag.html.err @@ -0,0 +1,3 @@ +./test/HTML/758518-tag.html:1: HTML parser error : PI is not started correctly +“ +^ diff --git a/result/HTML/758518-tag.html.sax b/result/HTML/758518-tag.html.sax new file mode 100644 index 00000000..fd4aa949 --- /dev/null +++ b/result/HTML/758518-tag.html.sax @@ -0,0 +1,10 @@ +SAX.setDocumentLocator() +SAX.startDocument() +SAX.error: PI is not started correctlySAX.startElement(html) +SAX.startElement(body) +SAX.startElement(p) +SAX.characters(“, 2) +SAX.endElement(p) +SAX.endElement(body) +SAX.endElement(html) +SAX.endDocument() diff --git a/runtest.c b/runtest.c index 378b38e3..dcf1405d 100644 --- a/runtest.c +++ b/runtest.c @@ -1854,6 +1854,7 @@ pushParseTest(const char *filename, const char *result, const char *base; int size, res; int cur = 0; + int chunkSize = 4; nb_tests++; /* @@ -1864,17 +1865,21 @@ pushParseTest(const char *filename, const char *result, return(-1); } + if (chunkSize > size) + chunkSize = size; + #ifdef LIBXML_HTML_ENABLED if (options & XML_PARSE_HTML) - ctxt = htmlCreatePushParserCtxt(NULL, NULL, base + cur, 4, filename, + ctxt = htmlCreatePushParserCtxt(NULL, NULL, base + cur, chunkSize, filename, XML_CHAR_ENCODING_NONE); else #endif - ctxt = xmlCreatePushParserCtxt(NULL, NULL, base + cur, 4, filename); + ctxt = xmlCreatePushParserCtxt(NULL, NULL, base + cur, chunkSize, filename); xmlCtxtUseOptions(ctxt, options); - cur += 4; + cur += chunkSize; + chunkSize = 1024; do { - if (cur + 1024 >= size) { + if (cur + chunkSize >= size) { #ifdef LIBXML_HTML_ENABLED if (options & XML_PARSE_HTML) htmlParseChunk(ctxt, base + cur, size - cur, 1); @@ -1885,11 +1890,11 @@ pushParseTest(const char *filename, const char *result, } else { #ifdef LIBXML_HTML_ENABLED if (options & XML_PARSE_HTML) - htmlParseChunk(ctxt, base + cur, 1024, 0); + htmlParseChunk(ctxt, base + cur, chunkSize, 0); else #endif - xmlParseChunk(ctxt, base + cur, 1024, 0); - cur += 1024; + xmlParseChunk(ctxt, base + cur, chunkSize, 0); + cur += chunkSize; } } while (cur < size); doc = ctxt->myDoc; diff --git a/test/HTML/758518-entity.html b/test/HTML/758518-entity.html new file mode 100644 index 00000000..d31c8ff9 --- /dev/null +++ b/test/HTML/758518-entity.html @@ -0,0 +1 @@ +&jÙ \ No newline at end of file diff --git a/test/HTML/758518-tag.html b/test/HTML/758518-tag.html new file mode 100644 index 00000000..935e7521 --- /dev/null +++ b/test/HTML/758518-tag.html @@ -0,0 +1 @@ +