From ff609a5ade6991ef1d8f892a7bce44a039fbe174 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Sun, 3 Mar 2019 23:30:45 -0500 Subject: Add additional defense against 0-length log segfaults Signed-off-by: Matthew Heon --- pkg/logs/logs.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/logs') diff --git a/pkg/logs/logs.go b/pkg/logs/logs.go index 1d920d691..bbd5509b1 100644 --- a/pkg/logs/logs.go +++ b/pkg/logs/logs.go @@ -313,11 +313,11 @@ func (w *logWriter) write(msg *logMessage) error { if w.opts.Timestamps && !w.doAppend { prefix := append([]byte(msg.timestamp.Format(timeFormat)), delimiter[0]) line = append(prefix, line...) - if line[len(line)-1] != '\n' { + if len(line) > 0 && line[len(line)-1] != '\n' { w.doAppend = true } } - if w.doAppend && line[len(line)-1] == '\n' { + if w.doAppend && len(line) > 0 && line[len(line)-1] == '\n' { w.doAppend = false } // If the line is longer than the remaining bytes, cut it. -- cgit v1.2.3-54-g00ecf