cmd/go: ignore XML errors after Go <meta> tags

Fixes #13683. Change-Id: I26afb3ac346beb95624f9032d94a29b5bc7853ef Reviewed-on: https://go-review.googlesource.com/18051Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

cmd/go: ignore XML errors after Go <meta> tags
Fixes #13683. Change-Id: I26afb3ac346beb95624f9032d94a29b5bc7853ef Reviewed-on: https://go-review.googlesource.com/18051Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
5b085482 · Russ Cox · 5270b57e · 5b085482 · 5b085482
Commit 5b085482 authored Dec 18, 2015 by Russ Cox
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 1 deletion

discovery.go src/cmd/go/discovery.go +1 -1

pkg_test.go src/cmd/go/pkg_test.go +9 -0

No files found.
--- a/src/cmd/go/discovery.go
+++ b/src/cmd/go/discovery.go
@@ -43,7 +43,7 @@ func parseMetaGoImports(r io.Reader) (imports []metaImport, err error) {
 	for {
 		t, err = d.RawToken()
 		if err != nil {
-			if err == io.EOF {
+			if err == io.EOF || len(imports) > 0 {
 				err = nil
 			}
 			return

--- a/src/cmd/go/pkg_test.go
+++ b/src/cmd/go/pkg_test.go
@@ -57,6 +57,15 @@ var parseMetaGoImportsTests = []struct {
 		<body>`,
 		[]metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}},
 	},
+	{
+		`<!doctype html><meta name="go-import" content="foo/bar git https://github.com/rsc/foo/bar">`,
+		[]metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}},
+	},
+	{
+		// XML doesn't like <div style=position:relative>.
+		`<!doctype html><title>Page Not Found</title><meta name=go-import content="chitin.io/chitin git https://github.com/chitin-io/chitin"><div style=position:relative>DRAFT</div>`,
+		[]metaImport{{"chitin.io/chitin", "git", "https://github.com/chitin-io/chitin"}},
+	},
 }

 func TestParseMetaGoImports(t *testing.T) {