nokogiri 1.11.0 → 1.11.5

data/patches/libxml2/0006-htmlParseComment-treat-as-if-it-closed-the-comment.patch

@@ -1,73 +0,0 @@
-From 4f51a6d2b1755ce5b36c524c215aad70d864ac1d Mon Sep 17 00:00:00 2001
-From: Mike Dalessio <mike.dalessio@gmail.com>
-Date: Mon, 3 Aug 2020 17:36:05 -0400
-Subject: [PATCH 1/2] 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
----
- HTMLparser.c | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/HTMLparser.c b/HTMLparser.c
-index 7b6d689..4d43479 100644
---- a/HTMLparser.c
-+++ b/HTMLparser.c
-@@ -3300,6 +3300,7 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
-     int q, ql;
-     int r, rl;
-     int cur, l;
-+    int next, nl;
-     xmlParserInputState state;
- 
-     /*
-@@ -3332,6 +3333,21 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
-     while (IS_CHAR(cur) &&
-            ((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;
- 
-@@ -3345,18 +3361,14 @@ htmlParseComment(htmlParserCtxtPtr ctxt) {
- 	    }
- 	    buf = tmp;
- 	}
--	COPY_BUF(ql,buf,len,q);
-+        COPY_BUF(ql,buf,len,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 (IS_CHAR(cur)) {
--- 
-2.25.1
-

data/patches/libxml2/0007-use-new-htmlParseLookupCommentEnd-to-find-comment-en.patch

@@ -1,103 +0,0 @@
-From b20d746fa7cbb74716171bc49d836af99927e41e Mon Sep 17 00:00:00 2001
-From: Mike Dalessio <mike.dalessio@gmail.com>
-Date: Sun, 11 Oct 2020 14:15:37 -0400
-Subject: [PATCH 2/2] use new htmlParseLookupCommentEnd to find comment ends
-
-Note that the caret in error messages generated during comment parsing
-may have moved by one byte.
-
-See guidance provided on incorrectly-closed comments here:
-
-https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-closed-comment
----
- HTMLparser.c | 46 +++++++++++++++++++++++++++++++++++++---------
- 1 file changed, 37 insertions(+), 9 deletions(-)
-
-diff --git a/HTMLparser.c b/HTMLparser.c
-index 4d43479..000dc3d 100644
---- a/HTMLparser.c
-+++ b/HTMLparser.c
-@@ -5331,6 +5331,39 @@ htmlParseLookupChars(htmlParserCtxtPtr ctxt, const xmlChar * stop,
-     return (-1);
- }
- 
-+/**
-+ * htmlParseLookupCommentEnd:
-+ * @ctxt: an HTML parser context
-+ *
-+ * Try to find a comment end tag in the input stream
-+ * The search includes "-->" as well as WHATWG-recommended incorrectly-closed tags.
-+ * (See https://html.spec.whatwg.org/multipage/parsing.html#parse-error-incorrectly-closed-comment)
-+ * This function has a side effect of (possibly) incrementing ctxt->checkIndex
-+ * to avoid rescanning sequences of bytes, it DOES change the state of the
-+ * parser, do not use liberally.
-+ * This wraps to htmlParseLookupSequence()
-+ *
-+ * Returns the index to the current parsing point if the full sequence is available, -1 otherwise.
-+ */
-+static int
-+htmlParseLookupCommentEnd(htmlParserCtxtPtr ctxt)
-+{
-+    int mark = 0;
-+    int cur = CUR_PTR - BASE_PTR;
-+
-+    while (mark >= 0) {
-+	mark = htmlParseLookupSequence(ctxt, '-', '-', 0, 1, 1);
-+	if ((mark < 0) ||
-+	    (NXT(mark+2) == '>') ||
-+	    ((NXT(mark+2) == '!') && (NXT(mark+3) == '>'))) {
-+	    return mark;
-+	}
-+	ctxt->checkIndex = cur + mark + 1;
-+    }
-+    return mark;
-+}
-+
-+
- /**
-  * htmlParseTryOrFinish:
-  * @ctxt:  an HTML parser context
-@@ -5507,8 +5540,7 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
- 		cur = in->cur[0];
- 	        if ((cur == '<') && (next == '!') &&
- 		    (in->cur[2] == '-') && (in->cur[3] == '-')) {
--		    if ((!terminate) &&
--		        (htmlParseLookupSequence(ctxt, '-', '-', '>', 1, 1) < 0))
-+		    if ((!terminate) && (htmlParseLookupCommentEnd(ctxt) < 0))
- 			goto done;
- #ifdef DEBUG_PUSH
- 		    xmlGenericError(xmlGenericErrorContext,
-@@ -5567,8 +5599,7 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
- 		next = in->cur[1];
- 		if ((cur == '<') && (next == '!') &&
- 		    (in->cur[2] == '-') && (in->cur[3] == '-')) {
--		    if ((!terminate) &&
--		        (htmlParseLookupSequence(ctxt, '-', '-', '>', 1, 1) < 0))
-+		    if ((!terminate) && (htmlParseLookupCommentEnd(ctxt) < 0))
- 			goto done;
- #ifdef DEBUG_PUSH
- 		    xmlGenericError(xmlGenericErrorContext,
-@@ -5614,8 +5645,7 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
- 		next = in->cur[1];
- 	        if ((cur == '<') && (next == '!') &&
- 		    (in->cur[2] == '-') && (in->cur[3] == '-')) {
--		    if ((!terminate) &&
--		        (htmlParseLookupSequence(ctxt, '-', '-', '>', 1, 1) < 0))
-+		    if ((!terminate) && (htmlParseLookupCommentEnd(ctxt) < 0))
- 			goto done;
- #ifdef DEBUG_PUSH
- 		    xmlGenericError(xmlGenericErrorContext,
-@@ -5871,9 +5901,7 @@ htmlParseTryOrFinish(htmlParserCtxtPtr ctxt, int terminate) {
- 			htmlParseDocTypeDecl(ctxt);
- 		    } else if ((cur == '<') && (next == '!') &&
- 			(in->cur[2] == '-') && (in->cur[3] == '-')) {
--			if ((!terminate) &&
--			    (htmlParseLookupSequence(
--				ctxt, '-', '-', '>', 1, 1) < 0))
-+			if ((!terminate) && (htmlParseLookupCommentEnd(ctxt) < 0))
- 			    goto done;
- #ifdef DEBUG_PUSH
- 			xmlGenericError(xmlGenericErrorContext,
--- 
-2.25.1
-