From 0f8021abd11b93228519269ffacb3af6634361d6 Mon Sep 17 00:00:00 2001 From: Harshavardhana Date: Wed, 25 Mar 2015 00:36:21 -0700 Subject: [PATCH] Fix nil pointer dereference when err is nil --- pkg/drivers/donut/donut.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/drivers/donut/donut.go b/pkg/drivers/donut/donut.go index 42912c008..73b2684f9 100644 --- a/pkg/drivers/donut/donut.go +++ b/pkg/drivers/donut/donut.go @@ -48,9 +48,11 @@ func Start(path string) (chan<- string, <-chan error, drivers.Driver) { // TODO donut driver should be passed in as Start param and driven by config var err *iodine.Error s.donut, err = donut.NewDonut(path) - err = err.Annotate(map[string]string{"path": path}) if err != nil { - log.Println(err.EmitHumanReadable()) + err = err.Annotate(map[string]string{"path": path}) + if err != nil { + log.Println(err.EmitHumanReadable()) + } } go start(ctrlChannel, errorChannel, s)