opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-22 01:48:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add additional defense against 0-length log segfaults

Browse Source 
Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon
2019-03-03 23:30:45 -05:00
parent 429f2e63a0
commit ff609a5ade
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/logs/logs.go
View File

@ -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.