From 062c9832a6cdb39bf38ad7a6dad51300a2e9a734 Mon Sep 17 00:00:00 2001 From: Alexander Egorenkov Date: Thu, 1 Oct 2020 13:16:00 +0200 Subject: vm/vmimpl/merger: remove all CRs from output Get rid of all places stripping \r in pkg/report. And adapt all tests. Signed-off-by: Alexander Egorenkov --- pkg/report/bsd.go | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'pkg/report/bsd.go') diff --git a/pkg/report/bsd.go b/pkg/report/bsd.go index d79c36b6c..327ddc8c6 100644 --- a/pkg/report/bsd.go +++ b/pkg/report/bsd.go @@ -50,17 +50,7 @@ func (ctx *bsd) ContainsCrash(output []byte) bool { } func (ctx *bsd) Parse(output []byte) *Report { - stripped := bytes.Replace(output, []byte{'\r', '\n'}, []byte{'\n'}, -1) - stripped = bytes.Replace(stripped, []byte{'\n', '\r'}, []byte{'\n'}, -1) - for len(stripped) != 0 && stripped[0] == '\r' { - stripped = stripped[1:] - } - rep := simpleLineParser(stripped, ctx.oopses, nil, ctx.ignores) - if rep == nil { - return nil - } - rep.Output = output - return rep + return simpleLineParser(output, ctx.oopses, nil, ctx.ignores) } func (ctx *bsd) Symbolize(rep *Report) error { -- cgit mrf-deployment