html: avoid endless loop on error token

yincongcyincong · gopherbot · commit b935f7b5d723 · 2024-12-18T08:05:47.000-08:00
Fixes #70179 Change-Id: I2a0a1fc2e96f7d8eefd0abdf7ef8ba243a6e8645 GitHub-Last-Rev: a601ecd GitHub-Pull-Request: #226 Reviewed-on: https://go-review.googlesource.com/c/net/+/624895 Reviewed-by: Ian Lance Taylor <iant@google.com> Auto-Submit: Ian Lance Taylor <iant@google.com> Reviewed-by: Roland Shoemaker <roland@golang.org> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
diff --git a/html/parse.go b/html/parse.go
@@ -840,6 +840,10 @@ func afterHeadIM(p *parser) bool {
 
 	p.parseImpliedToken(StartTagToken, a.Body, a.Body.String())
 	p.framesetOK = true
+	if p.tok.Type == ErrorToken {
+		// Stop parsing.
+		return true
+	}
 	return false
 }
 
diff --git a/html/parse_test.go b/html/parse_test.go
@@ -468,6 +468,7 @@ func TestParseFragmentForeignContentTemplates(t *testing.T) {
 	srcs := []string{
 		"<math><html><template><mn><template></template></template>",
 		"<math><math><head><mi><template>",
+		"<svg><head><title><select><input>",
 	}
 	for _, src := range srcs {
 		// The next line shouldn't infinite-loop.

Original file line number	Diff line number	Diff line change
`@@ -840,6 +840,10 @@ func afterHeadIM(p *parser) bool {`
`840`	`840`
`841`	`841`	`p.parseImpliedToken(StartTagToken, a.Body, a.Body.String())`
`842`	`842`	`p.framesetOK = true`
	`843`	`+ if p.tok.Type == ErrorToken {`
	`844`	`+ // Stop parsing.`
	`845`	`+ return true`
	`846`	`+ }`
`843`	`847`	`return false`
`844`	`848`	`}`
`845`	`849`
Original file line number	Diff line number	Diff line change
`@@ -468,6 +468,7 @@ func TestParseFragmentForeignContentTemplates(t *testing.T) {`
`468`	`468`	`srcs := []string{`
`469`	`469`	`"<math><html><template><mn><template></template></template>",`
`470`	`470`	`"<math><math><head><mi><template>",`
	`471`	`+ "<svg><head><title><select><input>",`
`471`	`472`	`}`
`472`	`473`	`for _, src := range srcs {`
`473`	`474`	`// The next line shouldn't infinite-loop.`