txtar/archive: ignore invalid file separators

In case the file separator line does not define a filename, it should be ignored. Updates golang/go#47193 Change-Id: I3a0fee584c0f6b2b41814e79d20884d6468a3b76 Reviewed-on: https://go-review.googlesource.com/c/tools/+/336932 Run-TryBot: Jay Conrod <[email protected]> gopls-CI: kokoro <[email protected]> Reviewed-by: Jay Conrod <[email protected]> Trust: Jay Conrod <[email protected]> Trust: Michael Matloob <[email protected]> TryBot-Result: Go Bot <[email protected]>
euroelessar · Jul 26, 2021 · ebce39e · ebce39e
1 parent 4fe0d6c
commit ebce39e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/txtar/archive.go b/txtar/archive.go
@@ -121,7 +121,7 @@ func isMarker(data []byte) (name string, after []byte) {
 	if i := bytes.IndexByte(data, '\n'); i >= 0 {
 		data, after = data[:i], data[i+1:]
 	}
-	if !bytes.HasSuffix(data, markerEnd) {
+	if !(bytes.HasSuffix(data, markerEnd) && len(data) >= len(marker)+len(markerEnd)) {
 		return "", nil
 	}
 	return strings.TrimSpace(string(data[len(marker) : len(data)-len(markerEnd)])), after

diff --git a/txtar/archive_test.go b/txtar/archive_test.go
@@ -29,14 +29,18 @@ More file 1 text.
 File 2 text.
 -- empty --
 -- noNL --
-hello world`,
+hello world
+-- empty filename line --
+some content
+-- --`,
 			parsed: &Archive{
 				Comment: []byte("comment1\ncomment2\n"),
 				Files: []File{
 					{"file1", []byte("File 1 text.\n-- foo ---\nMore file 1 text.\n")},
 					{"file 2", []byte("File 2 text.\n")},
 					{"empty", []byte{}},
 					{"noNL", []byte("hello world\n")},
+					{"empty filename line", []byte("some content\n-- --\n")},
 				},
 			},
 		},