fixed slice bounds out of range panic in syslog handler

sm3142 · sm3142 · commit 7d6c237285ea · 2016-08-03T13:28:45.000+02:00
diff --git a/handlers/syslog/syslog.go b/handlers/syslog/syslog.go
@@ -6,6 +6,7 @@ import (
 	stdlog "log"
 	"os"
 	"strconv"
+	"strings"
 
 	syslog "github.com/RackSec/srslog"
 
@@ -349,7 +350,9 @@ func defaultFormatFunc(s *Syslog) Formatter {
 					}
 				}
 			} else {
-				file = file[len(gopath):]
+				if strings.HasPrefix(file, gopath) {
+					file = file[len(gopath):]
+				}
 			}
 
 			b = append(b, e.Timestamp.Format(tsFormat)...)

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import (`
`6`	`6`	`stdlog "log"`
`7`	`7`	`"os"`
`8`	`8`	`"strconv"`
	`9`	`+ "strings"`
`9`	`10`
`10`	`11`	`syslog "github.com/RackSec/srslog"`
`11`	`12`
`@@ -349,7 +350,9 @@ func defaultFormatFunc(s *Syslog) Formatter {`
`349`	`350`	`}`
`350`	`351`	`}`
`351`	`352`	`} else {`
`352`		`- file = file[len(gopath):]`
	`353`	`+ if strings.HasPrefix(file, gopath) {`
	`354`	`+ file = file[len(gopath):]`
	`355`	`+ }`
`353`	`356`	`}`
`354`	`357`
`355`	`358`	`b = append(b, e.Timestamp.Format(tsFormat)...)`