diff options
| -rw-r--r-- | src/cmd/cover/cover.go | 4 | ||||
| -rw-r--r-- | src/cmd/cover/cover_test.go | 31 |
2 files changed, 35 insertions, 0 deletions
diff --git a/src/cmd/cover/cover.go b/src/cmd/cover/cover.go index 86ef128f2c..d8c4f85708 100644 --- a/src/cmd/cover/cover.go +++ b/src/cmd/cover/cover.go @@ -15,6 +15,7 @@ import ( "log" "os" "sort" + "strings" "cmd/internal/edit" "cmd/internal/objabi" @@ -341,6 +342,9 @@ func annotate(name string) { } } + if strings.ContainsAny(name, "\r\n") { + log.Fatalf("cover: input path contains newline character: %q", name) + } fmt.Fprintf(fd, "//line %s:1\n", name) fd.Write(newContent) diff --git a/src/cmd/cover/cover_test.go b/src/cmd/cover/cover_test.go index 28be231121..8a68911bd3 100644 --- a/src/cmd/cover/cover_test.go +++ b/src/cmd/cover/cover_test.go @@ -570,3 +570,34 @@ func run(c *exec.Cmd, t *testing.T) { t.Fatal(err) } } + +func TestSrcPathWithNewline(t *testing.T) { + t.Parallel() + buildCover(t) + + // srcPath is intentionally not clean so that the path passed to testcover + // will not normalize the trailing / to a \ on Windows. + srcPath := t.TempDir() + string(filepath.Separator) + "\npackage main\nfunc main() { panic(string([]rune{'u', 'h', '-', 'o', 'h'}))\n/*/main.go" + mainSrc := ` package main + +func main() { + /* nothing here */ + println("ok") +} +` + if err := os.MkdirAll(filepath.Dir(srcPath), 0777); err != nil { + t.Skipf("creating directory with bogus path: %v", err) + } + if err := os.WriteFile(srcPath, []byte(mainSrc), 0666); err != nil { + t.Skipf("writing file with bogus directory: %v", err) + } + + cmd := exec.Command(testcover, "-mode=atomic", srcPath) + cmd.Stderr = new(bytes.Buffer) + out, err := cmd.Output() + t.Logf("%v:\n%s", cmd, out) + t.Logf("stderr:\n%s", cmd.Stderr) + if err == nil { + t.Errorf("unexpected success; want failure due to newline in file path") + } +} |