1
0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00

htmlParseComment: treat --!> as if it closed the comment

See guidance provided on incorrectly-closed comments here:

https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-closed-comment
This commit is contained in:
Mike Dalessio
2020-08-03 17:36:05 -04:00
committed by Nick Wellnhofer
parent e28d9347bc
commit 29f5d20e84
7 changed files with 49 additions and 18 deletions

View File

@ -3297,6 +3297,7 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
int q, ql;
int r, rl;
int cur, l;
int next, nl;
xmlParserInputState state;
/*
@ -3329,6 +3330,21 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
while ((cur != 0) &&
((cur != '>') ||
(r != '-') || (q != '-'))) {
NEXTL(l);
next = CUR_CHAR(nl);
if (next == 0) {
SHRINK;
GROW;
next = CUR_CHAR(nl);
}
if ((q == '-') && (r == '-') && (cur == '!') && (next == '>')) {
htmlParseErr(ctxt, XML_ERR_COMMENT_NOT_FINISHED,
"Comment incorrectly closed by '--!>'", NULL, NULL);
cur = '>';
break;
}
if (len + 5 >= size) {
xmlChar *tmp;
@ -3348,17 +3364,13 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
htmlParseErrInt(ctxt, XML_ERR_INVALID_CHAR,
"Invalid char in comment 0x%X\n", q);
}
q = r;
ql = rl;
r = cur;
rl = l;
NEXTL(l);
cur = CUR_CHAR(l);
if (cur == 0) {
SHRINK;
GROW;
cur = CUR_CHAR(l);
}
cur = next;
l = nl;
}
buf[len] = 0;
if (cur == '>') {